diff --git a/libexec/portzap/git-changed-files b/libexec/portzap/git-changed-files
index 82e7f98..0a9b45f 100644
--- a/libexec/portzap/git-changed-files
+++ b/libexec/portzap/git-changed-files
@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath $(dirname $0)/../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 git="${localbase}"/bin/git
 gitdir=$1
 commit=$2
diff --git a/libexec/portzap/git-removed-files b/libexec/portzap/git-removed-files
index ed42d83..2e37835 100644
--- a/libexec/portzap/git-removed-files
+++ b/libexec/portzap/git-removed-files
@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath $(dirname $0)/../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 git="${localbase}"/bin/git
 gitdir=$1
 commit=$2
diff --git a/libexec/portzap/git-rev b/libexec/portzap/git-rev
index 4e5466a..5655b4c 100644
--- a/libexec/portzap/git-rev
+++ b/libexec/portzap/git-rev
@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath $(dirname $0)/../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 git="${localbase}"/bin/git
 gitdir=$1
 mode=u=rwX,g=rX,o=
diff --git a/libexec/portzap/portzap-checkout b/libexec/portzap/portzap-checkout
index a05c7af..54c62b6 100644
--- a/libexec/portzap/portzap-checkout
+++ b/libexec/portzap/portzap-checkout
@@ -4,7 +4,7 @@ set -e
 ##
 # variables
 libexec=$(dirname "$0")
-localbase=${LOCALBASE:-$(realpath $(dirname $0)/../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 git="${localbase}"/bin/git
 mode="u=rwX,g=rX,o="
 gitdir="$1"
diff --git a/libexec/portzap/portzap-clone b/libexec/portzap/portzap-clone
index 289b204..9b97c16 100755
--- a/libexec/portzap/portzap-clone
+++ b/libexec/portzap/portzap-clone
@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath $(dirname $0)/../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 libexec=$(dirname "$0")
 git="${localbase}"/bin/git
 giturl=$1
diff --git a/libexec/portzap/portzap-pull b/libexec/portzap/portzap-pull
index ffbc9eb..6814326 100755
--- a/libexec/portzap/portzap-pull
+++ b/libexec/portzap/portzap-pull
@@ -4,7 +4,7 @@ set -e
 ##
 # variables
 libexec=$(dirname "$0")
-localbase=${LOCALBASE:-$(realpath $(dirname $0)/../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../..)}
 git="${localbase}"/bin/git
 gitdir=$1
 mode="u=rwX,g=rX,o="