From 78ca74b27a2c0e9b2bb4e3f3c0f52c4c1cdd2e9f Mon Sep 17 00:00:00 2001
From: charlie <tchoi.tab@gmail.com>
Date: Sun, 25 Jan 2026 13:28:24 +0900
Subject: [PATCH 1/2] fix: cd handles spaced folder

---
 scripts/env/cd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/env/cd b/scripts/env/cd
index ea1d1953..22a4c0b1 100644
--- a/scripts/env/cd
+++ b/scripts/env/cd
@@ -19,7 +19,7 @@ fi
 if __gvm_is_function cd; then
     eval "$(echo "__gvm_oldcd()"; declare -f cd | sed '1 s/{/\'$'\n''{/' | tail -n +2)"
 elif [[ "$(builtin type cd)" == "cd is a shell builtin" ]]; then
-    eval "$(echo "__gvm_oldcd() { builtin cd \$*; return \$?; }")"
+    eval "$(echo "__gvm_oldcd() { builtin cd \"\$@\"; return \$?; }")"
 fi
 
 # Path cleanup
@@ -46,7 +46,7 @@ export PATH="$(__gvm_munge_path)"
 cd() {
     # @FIXME: gvm_oldcd is broken on re-sourcing .bashrc!
     if __gvm_is_function __gvm_oldcd; then
-        __gvm_oldcd $*
+        __gvm_oldcd "$@"
     fi
 
     local dot_go_version dot_go_pkgset rslt

From 246b5a9b4fe10d1f067b02766d6f39cc183f3901 Mon Sep 17 00:00:00 2001
From: charlie <tchoi.tab@gmail.com>
Date: Sun, 25 Jan 2026 13:29:24 +0900
Subject: [PATCH 2/2] fix: find_local_pkgset to handle spaces in folder

---
 scripts/function/find_local_pkgset | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/function/find_local_pkgset b/scripts/function/find_local_pkgset
index 074d9bff..3b54de09 100644
--- a/scripts/function/find_local_pkgset
+++ b/scripts/function/find_local_pkgset
@@ -3,18 +3,18 @@
 function find_local_pkgset
 {
     local TOPFILE=.gvm_local
-    if [ -d $TOPFILE ] ; then
+    if [ -d "$TOPFILE" ] ; then
         PWD= /bin/pwd
     else
-        local HERE=$PWD
+        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
+            echo "$T"
         fi
     fi
 }