diff --git a/_webi/bootstrap.sh b/_webi/bootstrap.sh
index a8efed9..6284ee5 100644
--- a/_webi/bootstrap.sh
+++ b/_webi/bootstrap.sh
@@ -207,7 +207,7 @@ EOF
 
     chmod a+x "$HOME/.local/bin/webi"
 
-    if [ -n ${WEBI_PKG:-} ]; then
+    if [ -n "${WEBI_PKG:-}" ]; then
         "$HOME/.local/bin/webi" "${WEBI_PKG}"
     else
         echo ""
diff --git a/_webi/template.sh b/_webi/template.sh
index c30527c..0c158ea 100644
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -119,7 +119,7 @@ __bootstrap_webi() {
             if cmp -s "${pkg_src_cmd}" "${my_current_cmd}"; then
                 echo "${my_canonical_name} already installed:"
                 echo -n "    ${pkg_dst}"
-                if [ ${pkg_src_cmd} != "${my_current_cmd}" ]; then
+                if [ "${pkg_src_cmd}" != "${my_current_cmd}" ]; then
                     echo -n " => ${pkg_src}"
                 fi
                 echo ""
@@ -317,7 +317,7 @@ __bootstrap_webi() {
 
     WEBI_SINGLE=
 
-    if [ -z ${WEBI_WELCOME:-} ]; then
+    if [ -z "${WEBI_WELCOME:-}" ]; then
         echo ""
         printf "Thanks for using webi to install '\e[32m${WEBI_PKG:-}\e[0m' on '\e[31m$(uname -s)/$(uname -m)\e[0m'.\n"
         echo "Have a problem? Experience a bug? Please let us know:"
@@ -351,14 +351,14 @@ __bootstrap_webi() {
         command -v pkg_post_install > /dev/null ||
         command -v pkg_done_message > /dev/null ||
         command -v pkg_format_cmd_version > /dev/null ||
-        [ -n ${WEBI_SINGLE:-} ] ||
-        [ -n ${pkg_cmd_name:-} ] ||
-        [ -n ${pkg_dst_cmd:-} ] ||
-        [ -n ${pkg_dst_dir:-} ] ||
-        [ -n ${pkg_dst:-} ] ||
-        [ -n ${pkg_src_cmd:-} ] ||
-        [ -n ${pkg_src_dir:-} ] ||
-        [ -n ${pkg_src:-} ]; then
+        [ -n "${WEBI_SINGLE:-}" ] ||
+        [ -n "${pkg_cmd_name:-}" ] ||
+        [ -n "${pkg_dst_cmd:-}" ] ||
+        [ -n "${pkg_dst_dir:-}" ] ||
+        [ -n "${pkg_dst:-}" ] ||
+        [ -n "${pkg_src_cmd:-}" ] ||
+        [ -n "${pkg_src_dir:-}" ] ||
+        [ -n "${pkg_src:-}" ]; then
 
         pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}"
 
@@ -406,7 +406,7 @@ __bootstrap_webi() {
     fi
 
     webi_path_add "$HOME/.local/bin"
-    if [ -z ${_WEBI_CHILD:-} ] && [ -f "$_webi_tmp/.PATH.env" ]; then
+    if [ -z "${_WEBI_CHILD:-}" ] && [ -f "$_webi_tmp/.PATH.env" ]; then
         if [ -n $(cat "$_webi_tmp/.PATH.env") ]; then
             printf 'PATH.env updated with:\n'
             sort -u "$_webi_tmp/.PATH.env"
diff --git a/arc/install.sh b/arc/install.sh
index bf1f246..6217787 100644
--- a/arc/install.sh
+++ b/arc/install.sh
@@ -21,7 +21,7 @@ __init_arc() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/arc-v3.2.0/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./arc_* ~/.local/opt/arc-v3.2.0/bin/arc
         mv ./arc_* "$pkg_src_cmd"
diff --git a/brew/install.sh b/brew/install.sh
index 136104f..aa979d7 100644
--- a/brew/install.sh
+++ b/brew/install.sh
@@ -9,7 +9,7 @@ _install_brew() {
 
     if [ -n "$(uname -a | grep -i darwin)" ]; then
         needs_xcode="$(/usr/bin/xcode-select -p > /dev/null 2> /dev/null || echo "true")"
-        if [ -n ${needs_xcode} ]; then
+        if [ -n "${needs_xcode}" ]; then
             echo ""
             echo ""
             echo "ERROR: Run this command to install XCode Command Line Tools first:"
diff --git a/chromedriver/install.sh b/chromedriver/install.sh
index 32d7b03..c54911a 100644
--- a/chromedriver/install.sh
+++ b/chromedriver/install.sh
@@ -21,7 +21,7 @@ __init_chromedriver() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/chromedriver-v88.0.4324.96/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./chromedriver-*/chromedriver ~/.local/opt/chromedriver-v88.0.4324.96/bin/chromedriver
         mv ./chromedriver* "$pkg_src_cmd"
diff --git a/dashmsg/install.sh b/dashmsg/install.sh
index e341471..dee6d87 100644
--- a/dashmsg/install.sh
+++ b/dashmsg/install.sh
@@ -20,7 +20,7 @@ __init_dashmsg() {
 
     pkg_install() {
         # $HOME/.local/opt/dashmsg-v0.9.0/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./dashmsg* "$HOME/.local/opt/dashmsg-v0.9.0/bin/dashmsg"
         mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
diff --git a/dotenv-linter/install.sh b/dotenv-linter/install.sh
index e358345..3927383 100644
--- a/dotenv-linter/install.sh
+++ b/dotenv-linter/install.sh
@@ -21,7 +21,7 @@ __init_dotenv_linter() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/dotenv-linter-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./dotenv-linter-*/dotenv-linter ~/.local/opt/dotenv-linter-v0.99.9/bin/dotenv-linter
         mv ./dotenv-linter "$pkg_src_cmd"
diff --git a/ffmpeg/install.sh b/ffmpeg/install.sh
index fefeff3..83ee19c 100644
--- a/ffmpeg/install.sh
+++ b/ffmpeg/install.sh
@@ -21,7 +21,7 @@ __init_ffmpeg() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/ffmpeg-v4.3.1/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./linux-x86 ~/.local/opt/ffmpeg-v4.3.1/bin/ffmpeg
         mv ./*-* "$pkg_src_cmd"
diff --git a/gh/install.sh b/gh/install.sh
index 800f46f..2ef8947 100644
--- a/gh/install.sh
+++ b/gh/install.sh
@@ -21,7 +21,7 @@ __init_gh() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/gh-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./gh-*/gh ~/.local/opt/gh-v0.99.9/bin/gh
         mv ./"$pkg_cmd_name"*/bin/gh "$pkg_src_cmd"
diff --git a/goreleaser/install.sh b/goreleaser/install.sh
index 72737f6..ea8860d 100644
--- a/goreleaser/install.sh
+++ b/goreleaser/install.sh
@@ -21,7 +21,7 @@ __init_goreleaser() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/goreleaser-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./goreleaser-*/goreleaser ~/.local/opt/goreleaser-v0.99.9/bin/goreleaser
         mv ./goreleaser "$pkg_src_cmd"
diff --git a/gpg-pubkey/gpg-pubkey.sh b/gpg-pubkey/gpg-pubkey.sh
index 49387fd..253967d 100755
--- a/gpg-pubkey/gpg-pubkey.sh
+++ b/gpg-pubkey/gpg-pubkey.sh
@@ -21,14 +21,14 @@ _create_gpg_key() {
 
     #grep 'name\s*=' ~/.gitconfig | head -n 1 | cut -d'=' -f2 | sed -e 's/^[\t ]*//'
     MY_NAME="$(git config --global user.name)"
-    if [ -z ${MY_NAME} ]; then
+    if [ -z "${MY_NAME}" ]; then
         return 1
     fi
 
     MY_EMAIL="$(
         __get_git_email
     )"
-    if [ -z ${MY_EMAIL} ]; then
+    if [ -z "${MY_EMAIL}" ]; then
         return 1
     fi
 
diff --git a/gpg/install.sh b/gpg/install.sh
index 7f37094..07e50c0 100644
--- a/gpg/install.sh
+++ b/gpg/install.sh
@@ -97,13 +97,13 @@ _create_gpg_key() {
 
     #grep 'name\s*=' ~/.gitconfig | head -n 1 | cut -d'=' -f2 | sed -e 's/^[\t ]*//'
     MY_NAME="$(git config --global user.name)"
-    if [ -z ${MY_NAME} ]; then
+    if [ -z "${MY_NAME}" ]; then
         return 0
     fi
 
     # grep 'email\s*=.*@' ~/.gitconfig | tr -d '\t ' | head -n 1 | cut -d'=' -f2
     MY_EMAIL="$(git config --global user.email)"
-    if [ -z ${MY_EMAIL} ]; then
+    if [ -z "${MY_EMAIL}" ]; then
         return 0
     fi
 
diff --git a/k9s/install.sh b/k9s/install.sh
index f7e2547..5f83b64 100644
--- a/k9s/install.sh
+++ b/k9s/install.sh
@@ -21,7 +21,7 @@ __init_k9s() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/k9s-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./k9s-*/k9s ~/.local/opt/k9s-v0.99.9/bin/k9s
         mv k9s "$pkg_src_cmd"
diff --git a/keypairs/install.sh b/keypairs/install.sh
index 7ab6cec..9c84d22 100644
--- a/keypairs/install.sh
+++ b/keypairs/install.sh
@@ -20,7 +20,7 @@ __init_keypairs() {
 
     pkg_install() {
         # $HOME/.local/opt/keypairs-v0.6.5/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./keypairs* "$HOME/.local/opt/keypairs-v0.6.5/bin/keypairs"
         mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
diff --git a/kubectx/install.sh b/kubectx/install.sh
index 6e9c95e..a06550b 100644
--- a/kubectx/install.sh
+++ b/kubectx/install.sh
@@ -21,7 +21,7 @@ __init_kubectx() {
     # pkg_install must be defined by every package
     pkg_install() {
         # e.g. ~/.local/opt/kubectx-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./kubectx-*/kubectx ~/.local/opt/kubectx-v0.99.9/bin/kubectx
         mv kubectx "$pkg_src_cmd"
diff --git a/kubens/install.sh b/kubens/install.sh
index 07a701b..b1c2b64 100644
--- a/kubens/install.sh
+++ b/kubens/install.sh
@@ -21,7 +21,7 @@ __init_kubens() {
     # pkg_install must be defined by every package
     pkg_install() {
         # e.g. ~/.local/opt/kubens-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./kubens-*/kubens ~/.local/opt/kubens-v0.99.9/bin/kubens
         mv kubens "$pkg_src_cmd"
diff --git a/lf/install.sh b/lf/install.sh
index 30849a3..a815588 100644
--- a/lf/install.sh
+++ b/lf/install.sh
@@ -20,7 +20,7 @@ __init_lf() {
 
     pkg_install() {
         # $HOME/.local/opt/lf-v0.21.0/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./lf "$HOME/.local/opt/lf-v0.21.0/bin/lf"
         mv ./lf "$pkg_src_cmd"
diff --git a/lsd/install.sh b/lsd/install.sh
index 4276cc5..43fa8ff 100644
--- a/lsd/install.sh
+++ b/lsd/install.sh
@@ -21,7 +21,7 @@ __init_lsd() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/lsd-v0.17.0/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./lsd-*/lsd ~/.local/opt/lsd-v0.17.0/bin/lsd
         mv ./lsd-*/lsd "$pkg_src_cmd"
diff --git a/mutagen/install.sh b/mutagen/install.sh
index a870047..4f1871e 100644
--- a/mutagen/install.sh
+++ b/mutagen/install.sh
@@ -19,7 +19,7 @@ __init_mutagen() {
 
     pkg_install() {
         # $HOME/.local/opt/mutagen-v0.11.8/
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./* "$HOME/.local/opt/mutagen-v0.11.8/"
         mv ./* "$pkg_src_dir"
diff --git a/myip/myip.sh b/myip/myip.sh
index 78e9578..9eb07ad 100644
--- a/myip/myip.sh
+++ b/myip/myip.sh
@@ -7,15 +7,15 @@ __show_my_ip() {
     ipv4=$(curl -s https://api.ipify.org || true)
     ipv6=$(curl -s https://api6.ipify.org || true)
 
-    if [ -n ${ipv4} ]; then
+    if [ -n "${ipv4}" ]; then
         echo "IPv4 (A)   : $ipv4"
     fi
 
-    if [ -n ${ipv6} ] && [ ${ipv6} != "${ipv4}" ]; then
+    if [ -n "${ipv6}" ] && [ "${ipv6}" != "${ipv4}" ]; then
         echo "IPv6 (AAAA): ${ipv6}"
     fi
 
-    if [ -z ${ipv4} ] && [ -z ${ipv6} ]; then
+    if [ -z "${ipv4}" ] && [ -z "${ipv6}" ]; then
         echo >&2 "error: no public IP address"
     fi
 }
diff --git a/node/install.sh b/node/install.sh
index b0f822a..a774e57 100644
--- a/node/install.sh
+++ b/node/install.sh
@@ -25,7 +25,7 @@ pkg_get_current_version() {
 
 pkg_install() {
     # mkdir -p $HOME/.local/opt
-    mkdir -p "$(dirname $pkg_src)"
+    mkdir -p "$(dirname "$pkg_src")"
 
     # mv ./node* "$HOME/.local/opt/node-v14.4.0"
     mv ./"$pkg_cmd_name"* "$pkg_src"
diff --git a/pandoc/install.sh b/pandoc/install.sh
index 2411296..02f44cb 100644
--- a/pandoc/install.sh
+++ b/pandoc/install.sh
@@ -21,7 +21,7 @@ __init_pandoc() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/pandoc-v2.10.1/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./pandoc-*/pandoc ~/.local/opt/pandoc-v2.10.1/bin/pandoc
         mv ./pandoc-*/bin/pandoc "$pkg_src_cmd"
diff --git a/postgres/install.sh b/postgres/install.sh
index ae896a1..453f05a 100644
--- a/postgres/install.sh
+++ b/postgres/install.sh
@@ -18,7 +18,7 @@ pkg_get_current_version() {
 
 pkg_install() {
     # mkdir -p $HOME/.local/opt
-    mkdir -p "$(dirname $pkg_src)"
+    mkdir -p "$(dirname "$pkg_src")"
 
     # mv ./pgqsl* "$HOME/.local/opt/postgres-v10.13"
     mv ./"p"* "$pkg_src"
diff --git a/rclone/install.sh b/rclone/install.sh
index 253210c..1b9e4b2 100644
--- a/rclone/install.sh
+++ b/rclone/install.sh
@@ -20,7 +20,7 @@ __init_rclone() {
 
     pkg_install() {
         # $HOME/.local/opt/rclone-v0.6.5/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./rclone* "$HOME/.local/opt/rclone-v0.6.5/bin/rclone"
         mv ./rclone*/rclone "$pkg_src_cmd"
diff --git a/rg/install.sh b/rg/install.sh
index 3172a0e..f247ef8 100644
--- a/rg/install.sh
+++ b/rg/install.sh
@@ -21,7 +21,7 @@ __init_rg() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/rg-v12.1.1/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./ripgrep-*/rg ~/.local/opt/rg-v12.1.1/bin/rg
         mv ./ripgrep-*/rg "$pkg_src_cmd"
diff --git a/sd/install.sh b/sd/install.sh
index 68deac8..ba75eb5 100644
--- a/sd/install.sh
+++ b/sd/install.sh
@@ -21,7 +21,7 @@ __init_sd() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/sd-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
         # mv ./sd-*/sd "$pkg_src_cmd"
         mv sd-* "$pkg_src_cmd"
     }
diff --git a/shellcheck/install.sh b/shellcheck/install.sh
index a3f0221..14243e8 100644
--- a/shellcheck/install.sh
+++ b/shellcheck/install.sh
@@ -21,7 +21,7 @@ __init_shellcheck() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/shellcheck-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./shellcheck-*/shellcheck ~/.local/opt/shellcheck-v0.99.9/bin/shellcheck
         mv ./shellcheck-*/shellcheck "$pkg_src_cmd"
diff --git a/shfmt/install.sh b/shfmt/install.sh
index 60a3a76..7e79c3f 100644
--- a/shfmt/install.sh
+++ b/shfmt/install.sh
@@ -19,7 +19,7 @@ __init_shfmt() {
 
     pkg_install() {
         # ~/.local/opt/shfmt-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
         mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
     }
 
diff --git a/ssh-adduser/ssh-adduser.sh b/ssh-adduser/ssh-adduser.sh
index 89ecc8f..2dfe094 100644
--- a/ssh-adduser/ssh-adduser.sh
+++ b/ssh-adduser/ssh-adduser.sh
@@ -60,16 +60,16 @@ main() {
         # Turn off PAM for macOS or it will allow password login
         my_pam="$(grep 'UsePAM yes' /etc/ssh/sshd_config)"
     fi
-    if [ -n ${my_pass} ] || [ -n ${my_pam} ]; then
+    if [ -n "${my_pass}" ] || [ -n "${my_pam}" ]; then
         echo "######################################################################"
         echo "#                                                                    #"
         echo "#                             WARNING                                #"
         echo "#                                                                    #"
         echo "# Found /etc/ssh/sshd_config:                                        #"
-        if [ -n ${my_pass} ]; then
+        if [ -n "${my_pass}" ]; then
             echo "#     PasswordAuthentication yes                                     #"
         fi
-        if [ -n ${my_pam} ]; then
+        if [ -n "${my_pam}" ]; then
             echo "#     UsePAM yes                                                     #"
         fi
         echo "#                                                                    #"
diff --git a/syncthing/install.sh b/syncthing/install.sh
index d2c82ad..63f34fd 100644
--- a/syncthing/install.sh
+++ b/syncthing/install.sh
@@ -20,7 +20,7 @@ __init_syncthing() {
 
     pkg_install() {
         # $HOME/.local/opt/syncthing-v1.12.1/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./syncthing* "$HOME/.local/opt/syncthing-v1.12.1/bin/syncthing"
         mv ./syncthing*/"$pkg_cmd_name"* "$pkg_src_cmd"
diff --git a/vps-addswap/install.sh b/vps-addswap/install.sh
index da072fa..756e36b 100644
--- a/vps-addswap/install.sh
+++ b/vps-addswap/install.sh
@@ -9,7 +9,7 @@ __init_vps_addswap() {
 
     if [ $(id -u) -ne 0 ]; then
         echo Usage:
-        echo '        sudo env PATH="$PATH" vps-addswap' $my_size
+        echo '        sudo env PATH="$PATH" vps-addswap' "$my_size"
         exit 1
     fi
 
diff --git a/watchexec/install.sh b/watchexec/install.sh
index 8dec015..9ccbf92 100644
--- a/watchexec/install.sh
+++ b/watchexec/install.sh
@@ -21,7 +21,7 @@ __init_watchexec() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/watchexec-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./watchexec-*/watchexec ~/.local/opt/watchexec-v0.99.9/bin/watchexec
         mv ./watchexec-*/watchexec "$pkg_src_cmd"
diff --git a/xz/install.sh b/xz/install.sh
index 595cfb7..d374a33 100644
--- a/xz/install.sh
+++ b/xz/install.sh
@@ -21,16 +21,16 @@ __init_xz() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/xz-v5.2.5/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
+        mkdir -p "$(dirname "$pkg_src_cmd")"
 
         # mv ./xz-*/{xz,xzdec} ~/.local/opt/xz-v5.2.5/bin/
-        mv ./xz-*/xz* "$(dirname $pkg_src_cmd)"
-        ln -s xz "$(dirname $pkg_src_cmd)/unxz"
+        mv ./xz-*/xz* "$(dirname "$pkg_src_cmd")"
+        ln -s xz "$(dirname "$pkg_src_cmd")/unxz"
     }
 
     pkg_post_install() {
         # supplements webi_link
-        ln -s xz "$(dirname $pkg_dst_cmd)/unxz"
+        ln -s xz "$(dirname "$pkg_dst_cmd")/unxz"
 
         webi_post_install
     }