diff --git a/common/base.sh b/common/base.sh
index cf436d2..cdfc7d9 100644
--- a/common/base.sh
+++ b/common/base.sh
@@ -154,7 +154,7 @@ linux_get_subsys()
 	local INIT="$(sed 's/\x0/\n/g' /proc/1/cmdline | head -n 1)"
 
 	[ -L "$INIT" ] && INIT=$(readlink "$INIT")
-	INIT=$(basename "$INIT")
+	INIT="$(basename "$INIT")"
 	if [ -f "/etc/openwrt_release" ] && [ "$INIT" = "procd" ] ; then
 		SUBSYS=openwrt
 	elif [ -x "/bin/ndm" ] ; then
diff --git a/common/installer.sh b/common/installer.sh
index 2a3142c..a09c846 100644
--- a/common/installer.sh
+++ b/common/installer.sh
@@ -89,7 +89,7 @@ check_system()
 		# do not use 'exe' because it requires root
 		local INIT="$(sed 's/\x0/\n/g' /proc/1/cmdline | head -n 1)"
 		[ -L "$INIT" ] && INIT=$(readlink "$INIT")
-		INIT=$(basename "$INIT")
+		INIT="$(basename "$INIT")"
 		# some distros include systemctl without systemd
 		if [ -d "$SYSTEMD_DIR" ] && [ -x "$SYSTEMCTL" ] && [ "$INIT" = "systemd" ]; then
 			SYSTEM=systemd
diff --git a/common/linux_iphelper.sh b/common/linux_iphelper.sh
index 3c737aa..e22f91a 100644
--- a/common/linux_iphelper.sh
+++ b/common/linux_iphelper.sh
@@ -117,7 +117,7 @@ resolve_lower_devices()
 		{
 			local l lower lowers
 			while read lower; do
-				lower=$(basename "$lower")
+				lower="$(basename "$lower")"
 				l="${lower#lower_*}"
 				[  "$l" != "$lower" ] && append_separator_list lowers ' ' '' "$l"
 			done
diff --git a/install_bin.sh b/install_bin.sh
index 7f117fe..fb33462 100755
--- a/install_bin.sh
+++ b/install_bin.sh
@@ -41,7 +41,7 @@ check_dir()
 # link or copy executables. uncomment either ln or cp, comment other
 ccp()
 {
-	local F=$(basename $1)
+	local F="$(basename "$1")"
 	[ -d "$ZAPRET_BASE/$2" ] || mkdir "$ZAPRET_BASE/$2"
 	[ -f "$ZAPRET_BASE/$2/$F" ] && rm -f "$ZAPRET_BASE/$2/$F"
 	ln -fs "../$BINS/$1" "$ZAPRET_BASE/$2" && echo linking : "../$BINS/$1" =\> "$ZAPRET_BASE/$2"
diff --git a/install_easy.sh b/install_easy.sh
index 081674d..9b3dc85 100755
--- a/install_easy.sh
+++ b/install_easy.sh
@@ -540,7 +540,7 @@ check_location()
 			fix_perms "$ZAPRET_TARGET"
 			[ "$keep" = "Y" ] && backup_restore_settings 0
 			echo relaunching itself from $ZAPRET_TARGET
-			exec "$ZAPRET_TARGET/$(basename $0)"
+			exec "$ZAPRET_TARGET/$(basename "$0")"
 		else
 			echo copying aborted. exiting
 			exitp 3