diff --git a/install_bin.sh b/install_bin.sh
index c8a9d5b..080802d 100755
--- a/install_bin.sh
+++ b/install_bin.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 BINS=binaries
 BINDIR=$EXEDIR/$BINS
 
diff --git a/install_easy.sh b/install_easy.sh
index 125c034..f3b8de7 100755
--- a/install_easy.sh
+++ b/install_easy.sh
@@ -2,8 +2,8 @@
 
 # automated script for easy installing zapret
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+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 su && exec su -c $0
+	exists sudo && exec sudo "$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
diff --git a/ipset/create_ipset.sh b/ipset/create_ipset.sh
index 22fe911..1741e9e 100755
--- a/ipset/create_ipset.sh
+++ b/ipset/create_ipset.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # create ipset from resolved ip's
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 IPSET_OPT="hashsize 131072 maxelem 524288"
 IP2NET=$EXEDIR/../ip2net/ip2net
 
diff --git a/ipset/get_antizapret.sh b/ipset/get_antizapret.sh
index 6bc078d..c7d9405 100755
--- a/ipset/get_antizapret.sh
+++ b/ipset/get_antizapret.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # get ip list from antizapret.prostovpn.org
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 
diff --git a/ipset/get_combined.sh b/ipset/get_combined.sh
index 52c26db..f6b36d4 100755
--- a/ipset/get_combined.sh
+++ b/ipset/get_combined.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # get rublacklist and resolve it
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 
diff --git a/ipset/get_config.sh b/ipset/get_config.sh
index 0ae2c8f..df1c8c8 100755
--- a/ipset/get_config.sh
+++ b/ipset/get_config.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # run script specified in config
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/../config"
 
diff --git a/ipset/get_hostlist.sh b/ipset/get_hostlist.sh
index 8f3fa61..f37dfc4 100755
--- a/ipset/get_hostlist.sh
+++ b/ipset/get_hostlist.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # get domain list. not IP
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 
diff --git a/ipset/get_reestr.sh b/ipset/get_reestr.sh
index 9cf1403..e60668e 100755
--- a/ipset/get_reestr.sh
+++ b/ipset/get_reestr.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # get rublacklist and resolve it
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 
diff --git a/ipset/get_user.sh b/ipset/get_user.sh
index e1646ce..61b2c16 100755
--- a/ipset/get_user.sh
+++ b/ipset/get_user.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # resolve user host list
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+EXEDIR=$(dirname "$SCRIPT")
 
 . "$EXEDIR/def.sh"
 
diff --git a/uninstall_easy.sh b/uninstall_easy.sh
index 893d318..8b94373 100755
--- a/uninstall_easy.sh
+++ b/uninstall_easy.sh
@@ -2,8 +2,8 @@
 
 # automated script for easy uninstalling zapret
 
-SCRIPT=$(readlink -f $0)
-EXEDIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f "$0")
+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 su && exec su -c $0
+	exists sudo && exec sudo "$0"
+	exists su && exec su -c "$0"
 	echo su or sudo not found
 	exitp 2
 }