shell scripts : add commas to SCRIPT,EXEDIR

install_bin.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 BINS=binaries
 BINDIR=$EXEDIR/$BINS
 

install_easy.sh

@@ -2,8 +2,8 @@
 
 # automated script for easy installing zapret
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 ZAPRET_BASE=/opt/zapret
 ZAPRET_CONFIG=$EXEDIR/config
 
@@ -34,8 +34,8 @@ exitp()
 
 [ $(id -u) -ne "0" ] && {
 	echo root is required
-	exists sudo && exec sudo $0
+	exists sudo && exec sudo "$0"
-	exists su && exec su -c $0
+	exists su && exec su -c "$0"
 	echo su or sudo not found
 	exitp 2
 }
@@ -146,6 +146,7 @@ ask_list()
 write_config_var()
 {
 	# $1 - mode var
+	local M
 	eval M="\$$1"
 	
 	if [ -n "$M" ]; then

ipset/create_ipset.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # create ipset from resolved ip's
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 IPSET_OPT="hashsize 131072 maxelem 524288"
 IP2NET=$EXEDIR/../ip2net/ip2net
 

ipset/get_antizapret.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # get ip list from antizapret.prostovpn.org
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 

ipset/get_combined.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # get rublacklist and resolve it
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 

ipset/get_config.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # run script specified in config
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/../config"
 

ipset/get_hostlist.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # get domain list. not IP
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 

ipset/get_reestr.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # get rublacklist and resolve it
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 

ipset/get_user.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # resolve user host list
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 

uninstall_easy.sh

@@ -2,8 +2,8 @@
 
 # automated script for easy uninstalling zapret
 
-SCRIPT=$(readlink -f $0)
+SCRIPT=$(readlink -f "$0")
-EXEDIR=$(dirname $SCRIPT)
+EXEDIR=$(dirname "$SCRIPT")
 GET_IPLIST_PREFIX=/ipset/get_
 
 exists()
@@ -25,8 +25,8 @@ exitp()
 
 [ $(id -u) -ne "0" ] && {
 	echo root is required
-	exists sudo && exec sudo $0
+	exists sudo && exec sudo "$0"
-	exists su && exec su -c $0
+	exists su && exec su -c "$0"
 	echo su or sudo not found
 	exitp 2
 }