diff --git a/scripts/function/find_local_pkgset b/scripts/function/find_local_pkgset
index 074d9bf..5d00627 100644
--- a/scripts/function/find_local_pkgset
+++ b/scripts/function/find_local_pkgset
@@ -8,11 +8,11 @@ function find_local_pkgset
     else
         local HERE=$PWD
         T=
-        while [ \( ! \( -d $TOPFILE \) \) -a \( $PWD != "/" \) ]; do
+        while [ \( ! \( -d "$TOPFILE" \) \) -a \( "$PWD" != "/" \) ]; do
             builtin cd ..
             T=`PWD= /bin/pwd`
         done
-        builtin cd $HERE
+        builtin cd "$HERE"
         if [ -d "$T/$TOPFILE" ]; then
             echo $T
         fi