diff --git a/torproxy.sh b/torproxy.sh index d7f6ccd..a35566e 100755 --- a/torproxy.sh +++ b/torproxy.sh @@ -128,17 +128,16 @@ shift $(( OPTIND - 1 )) $(sed 's/^/"/; s/$/"/; s/;/" "/g' <<< $SERVICE) [[ "${USERID:-""}" =~ ^[0-9]+$ ]] && usermod -u $USERID -o tor [[ "${GROUPID:-""}" =~ ^[0-9]+$ ]] && groupmod -g $GROUPID -o tor -for env in $(printenv | grep '^TOR_'); do +while read -r env; do name="$(cut -c5- <<< ${env%%=*})" - val="\"${env##*=}\"" + val="${env##*=}" [[ "$name" =~ _ ]] && continue - [[ "$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 echo "$name $val" >>/etc/tor/torrc fi -done +done <<< $(printenv | grep '^TOR_') chown -Rh tor. /etc/tor /var/lib/tor /var/log/tor 2>&1 | grep -iv 'Read-only' || :