Clean up privoxy-tor-toggle; untabify; clean up messages; remove fwd-incompatible...

svn:r3742

diff --git a/contrib/privoxy-tor-toggle b/contrib/privoxy-tor-toggle
index 5e865c9b5c291ff400e13c01d9c743aa0124fefe..8f9cd51bd96e64af4d4840c53a8470fe1ed78995 100644 (file)
--- a/contrib/privoxy-tor-toggle
+++ b/contrib/privoxy-tor-toggle
@@ -1,20 +1,20 @@
 #!/bin/sh
-# A script to turn tor sock4a in privoxy on or off.
+# A script to turn Tor SOCKS4a in Privoxy on or off.
 
-CONFFILE=/etc/privoxy/config           # privoxy config file.
-TOR_REG="forward.*localhost:9050"      # Regular expression open the tor in privoxy
-PRIVOXY="/etc/init.d/privoxy restart"  # command to reload privoxy config file.
-SED="/bin/sed"                         # sed command, of course.
-GREP="/bin/grep"                       # grep command.
+CONFFILE=/etc/privoxy/config            # privoxy config file.
+TOR_REG="forward.*localhost:9050"       # Regular expression to find Tor in privoxy
+PRIVOXY="/etc/init.d/privoxy restart"   # command to reload privoxy config file.
+SED="/bin/sed"                          # sed command, of course.
+GREP="/bin/grep"                        # grep command.
 
 usage () {
 echo "\
+privoxy-tor-toggle: Change Privoxy's configuration to use/not use Tor.
 Usage:
-   privoxy.tor                         <-- No arguments. Switch the tor on or off.
-   privoxy.tor [on|off]                <-- Set the tor on or off.
-   privoxy.tor !.*xia          <-- Any argument other than above shows
-                                   current status of the tor.
-   privoxy.tor [-h|--help|-?]  <-- Print usage.
+   privoxy.tor                  <-- Switch Tor on or off.
+   privoxy.tor [on|off]         <-- Set Tor on or off.
+   privoxy.tor status           <-- Display Tor's current status.
+   privoxy.tor [-h|--help|-?]   <-- Print usage.
 "
 }
 
@@ -34,22 +34,22 @@ set_tor () {
    tor_gate=$1
    get_status
    if [ $tor_status = $tor_gate ] ; then
-      echo "The tor is already $1."
+      echo "Tor is already $1."
       return
    elif [ $tor_gate = flip ] ; then
-       if [ $tor_status = on ] ; then
-               tor_gate=off
-       elif [ $tor_status = off ] ; then
-               tor_gate=on
-       fi
+        if [ $tor_status = on ] ; then
+                tor_gate=off
+        elif [ $tor_status = off ] ; then
+                tor_gate=on
+        fi
    fi
-   echo "Turning the tor $tor_gate..."
+   echo "Turning Tor $tor_gate..."
    if [ $tor_gate = on ] ; then
-       reg=s/^#\($TOR_REG\)/\\1/
-       $SED -i.bak -r "$reg"  $CONFFILE
+        reg=s/^#\($TOR_REG\)/\\1/
+        $SED -i.bak -r "$reg"  $CONFFILE
    else
-       reg=s/^\($TOR_REG\)/#\\1/
-       $SED -i.bak -r "$reg" $CONFFILE
+        reg=s/^\($TOR_REG\)/#\\1/
+        $SED -i.bak -r "$reg" $CONFFILE
    fi
    $PRIVOXY
    return 0;
@@ -59,13 +59,15 @@ if [ x$1 = x ] ; then
    set_tor flip
 elif [ $1 = on ] ; then
    set_tor on
-elif [ $1 = off ] ; then 
+elif [ $1 = off ] ; then
    set_tor off
+elif [ $1 = status ] ; then
+   get_status
+   echo "Tor is $tor_status"
 elif [ $1 = --help ] || [ $1 = -h ] || [ $1 = "-?" ] ; then
    usage
    exit 0
 else
-   get_status
-   echo "Currently, the tor is $tor_status."
+   echo "Unrecognized option: \"$1\""
 fi