torproxy.sh fix quotations for variables

Author: David Personette

tor-route-all-traffic.sh

@@ -26,15 +26,15 @@ set -euo pipefail                           # Treat unset variables as an error
 _non_tor="192.168.1.0/24 192.168.0.0/24"
 
 ### get the container tor runs in
-_tor_container=$(docker ps | awk '/torproxy/ {print $NF; quit}')
+_tor_container="$(docker ps | awk '/torproxy/ {print $NF; quit}')"
 if [[ "$_tor_container" == "" ]]; then
     echo 'ERROR: you must start a tor proxy container first, IE:'
     echo '    docker run -d --net host --restart always dperson/torproxy'
     exit 1
 fi
 
 ### get the UID that tor runs as
-_tor_uid=$(docker exec $_tor_container id -u tor)
+_tor_uid="$(docker exec $_tor_container id -u tor)"
 
 ### Tor's TransPort
 _trans_port="9040"

torproxy.sh

@@ -73,7 +73,7 @@ password() { local passwd="$1" file=/etc/tor/torrc
 # Arguments:
 #   none)
 # Return: Help text
-usage() { local RC=${1:-0}
+usage() { local RC="${1:-0}"
     echo "Usage: ${0##*/} [-opt] [command]
 Options (fields in '[]' are optional, '<>' are required):
     -h          This help
@@ -117,10 +117,10 @@ shift $(( OPTIND - 1 ))
 [[ "${USERID:-""}" =~ ^[0-9]+$ ]] && usermod -u $USERID -o tor
 [[ "${GROUPID:-""}" =~ ^[0-9]+$ ]] && groupmod -g $GROUPID -o tor
 for env in $(printenv | grep '^TOR_'); do
-    name=$(cut -c4- <<< ${env%%=*})
+    name="$(cut -c4- <<< ${env%%=*})"
     val="\"${env##*=}\""
     [[ "$name" =~ _ ]] && continue
-    [[ "$val" =~ ^\"([0-9]+|false|true)\"$ ]] && val=$(sed 's|"||g' <<<$val)
+    [[ "$val" =~ ^\"([0-9]+|false|true)\"$ ]] && val="$(sed 's|"||g' <<< $val)"
     if grep -q "^$name" /etc/tor/torrc; then
         sed -i "/^$name/s| .*| $val|" /etc/tor/torrc
     else