|
@@ -420,14 +420,14 @@ function tor_add_bridge {
|
420
|
420
|
|
421
|
421
|
apt-get -yq install obfs4proxy
|
422
|
422
|
|
423
|
|
- if grep "ClientTransportPlugin" /etc/tor/torrc; then
|
|
423
|
+ if grep -q "ClientTransportPlugin" /etc/tor/torrc; then
|
424
|
424
|
sed -i 's|#ClientTransportPlugin|ClientTransportPlugin|g' /etc/tor/torrc
|
425
|
425
|
sed -i 's|# ClientTransportPlugin|ClientTransportPlugin|g' /etc/tor/torrc
|
426
|
426
|
sed -i 's|ClientTransportPlugin.*|ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy managed|g' /etc/tor/torrc
|
427
|
427
|
else
|
428
|
428
|
echo 'ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy managed' >> /etc/tor/torrc
|
429
|
429
|
fi
|
430
|
|
- if grep "UseBridges" /etc/tor/torrc; then
|
|
430
|
+ if grep -q "UseBridges" /etc/tor/torrc; then
|
431
|
431
|
sed -i 's|#UseBridges|UseBridges|g' /etc/tor/torrc
|
432
|
432
|
sed -i 's|# UseBridges|UseBridges|g' /etc/tor/torrc
|
433
|
433
|
sed -i 's|UseBridges.*|UseBridges 1|g' /etc/tor/torrc
|
|
@@ -436,7 +436,7 @@ function tor_add_bridge {
|
436
|
436
|
fi
|
437
|
437
|
|
438
|
438
|
bridge_str="Bridge $bridge_type ${bridge_ip_address}:${bridge_port} ${bridge_key}"
|
439
|
|
- if ! grep "${bridge_str}" /etc/tor/torrc; then
|
|
439
|
+ if ! grep -q "${bridge_str}" /etc/tor/torrc; then
|
440
|
440
|
sed -i "/UseBridges/a ${bridge_str}" >> /etc/tor/torrc
|
441
|
441
|
fi
|
442
|
442
|
|
|
@@ -450,22 +450,22 @@ function tor_remove_bridge {
|
450
|
450
|
if [[ "$bridge_ip_address" == *"."* ]]; then
|
451
|
451
|
bridge_str="Bridge $bridge_type ${bridge_ip_address}"
|
452
|
452
|
else
|
453
|
|
- if grep " ${bridge_ip_address}" /etc/tor/torrc; then
|
|
453
|
+ if grep -q " ${bridge_ip_address}" /etc/tor/torrc; then
|
454
|
454
|
bridge_str=" ${bridge_ip_address}"
|
455
|
455
|
else
|
456
|
456
|
return
|
457
|
457
|
fi
|
458
|
458
|
fi
|
459
|
|
- if grep "${bridge_str}" /etc/tor/torrc; then
|
|
459
|
+ if grep -q "${bridge_str}" /etc/tor/torrc; then
|
460
|
460
|
sed -i "/${bridge_str}/d" /etc/tor/torrc
|
461
|
461
|
fi
|
462
|
462
|
|
463
|
463
|
# If there are no bridges remaining then remove UseBridges
|
464
|
|
- if ! grep "Bridge " /etc/tor/torrc; then
|
465
|
|
- if ! grep "#UseBridges" /etc/tor/torrc; then
|
|
464
|
+ if ! grep -q "Bridge " /etc/tor/torrc; then
|
|
465
|
+ if ! grep -q "#UseBridges" /etc/tor/torrc; then
|
466
|
466
|
sed -i 's|UseBridges|#UseBridges|g' /etc/tor/torrc
|
467
|
467
|
fi
|
468
|
|
- if ! grep "#ClientTransportPlugin" /etc/tor/torrc; then
|
|
468
|
+ if ! grep -q "#ClientTransportPlugin" /etc/tor/torrc; then
|
469
|
469
|
sed -i 's|ClientTransportPlugin|#ClientTransportPlugin|g' /etc/tor/torrc
|
470
|
470
|
fi
|
471
|
471
|
fi
|
|
@@ -493,7 +493,7 @@ function tor_create_bridge_relay {
|
493
|
493
|
sed -i 's|#ServerTransportPlugin.*|ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy|g' /etc/tor/torrc
|
494
|
494
|
sed -i 's|ServerTransportPlugin.*|ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy|g' /etc/tor/torrc
|
495
|
495
|
|
496
|
|
- if ! grep 'ExtORPort ' /etc/tor/torrc; then
|
|
496
|
+ if ! grep -q 'ExtORPort ' /etc/tor/torrc; then
|
497
|
497
|
echo "ExtORPort $TOR_BRIDGE_PORT" >> /etc/tor/torrc
|
498
|
498
|
else
|
499
|
499
|
sed -i "s|#ExtORPort .*|ExtORPort $TOR_BRIDGE_PORT|g" /etc/tor/torrc
|
|
@@ -512,19 +512,19 @@ function tor_create_bridge_relay {
|
512
|
512
|
}
|
513
|
513
|
|
514
|
514
|
function tor_remove_bridge_relay {
|
515
|
|
- if ! grep '#BridgeRelay ' /etc/tor/torrc; then
|
|
515
|
+ if ! grep -q '#BridgeRelay ' /etc/tor/torrc; then
|
516
|
516
|
sed -i 's|BridgeRelay |#BridgeRelay |g' /etc/tor/torrc
|
517
|
517
|
fi
|
518
|
|
- if ! grep '#ServerTransportPlugin ' /etc/tor/torrc; then
|
|
518
|
+ if ! grep -q '#ServerTransportPlugin ' /etc/tor/torrc; then
|
519
|
519
|
sed -i 's|ServerTransportPlugin |#ServerTransportPlugin |g' /etc/tor/torrc
|
520
|
520
|
fi
|
521
|
|
- if ! grep '#ExtORPort ' /etc/tor/torrc; then
|
|
521
|
+ if ! grep -q '#ExtORPort ' /etc/tor/torrc; then
|
522
|
522
|
sed -i 's|ExtORPort |#ExtORPort |g' /etc/tor/torrc
|
523
|
523
|
fi
|
524
|
|
- if ! grep '#ContactInfo ' /etc/tor/torrc; then
|
|
524
|
+ if ! grep -q '#ContactInfo ' /etc/tor/torrc; then
|
525
|
525
|
sed -i "s|ContactInfo |#ContactInfo |g" /etc/tor/torrc
|
526
|
526
|
fi
|
527
|
|
- if ! grep '#Nickname ' /etc/tor/torrc; then
|
|
527
|
+ if ! grep -q '#Nickname ' /etc/tor/torrc; then
|
528
|
528
|
sed -i "s|Nickname |#Nickname |g" /etc/tor/torrc
|
529
|
529
|
fi
|
530
|
530
|
read_config_param 'TOR_BRIDGE_PORT'
|