Simplify tor-wifi installation

This commit is contained in:
Bob Mottram 2014-12-27 16:34:58 +00:00
parent ff53f9010c
commit e1a86ee203
1 changed files with 16 additions and 3 deletions

View File

@ -386,11 +386,24 @@ function argument_checks {
exit 2 exit 2
fi fi
if [ ! $MY_USERNAME ]; then if [ ! $MY_USERNAME ]; then
show_help if [[ $DOMAIN_NAME == "tor-wifi" || $DOMAIN_NAME == "torwifi" || $DOMAIN_NAME == "tor-hotspot" || $DOMAIN_NAME == "torhotspot" || $DOMAIN_NAME == "tor-access-point" || $DOMAIN_NAME == "tor" || $DOMAIN_NAME == "tor-dongle" || $DOMAIN_NAME == "tordongle" ]]; then
exit 3 if [ -d /home/tor ]; then
$MY_USERNAME="tor"
fi
if [ -d /home/toruser ]; then
$MY_USERNAME="toruser"
fi
if [ ! $MY_USERNAME ]; then
show_help
exit 3
fi
else
show_help
exit 3
fi
fi fi
if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then
if [[ $DOMAIN_NAME == "tor-wifi" || $DOMAIN_NAME == "torwifi" ]]; then if [[ $DOMAIN_NAME == "tor-wifi" || $DOMAIN_NAME == "torwifi" || $DOMAIN_NAME == "tor-hotspot" || $DOMAIN_NAME == "torhotspot" || $DOMAIN_NAME == "tor-access-point"]]; then
DOMAIN_NAME="tor-wifi" DOMAIN_NAME="tor-wifi"
SYSTEM_TYPE=$VARIANT_TOR_WIFI SYSTEM_TYPE=$VARIANT_TOR_WIFI
ROUTE_THROUGH_TOR="yes" ROUTE_THROUGH_TOR="yes"