Bugfix: keep exports in cd until the last second.

rvm · Feb 28, 2011 · 7476e81 · 7476e81
1 parent b00382b
commit 7476e81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/scripts/cd b/scripts/cd
@@ -13,7 +13,7 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       true ${rvm_scripts_path:="$rvm_path/scripts"}
       source "$rvm_scripts_path/initialize"
       source "$rvm_scripts_path/hook"
-
+      __rvm_unset_exports
     }
 
     autoload is-at-least
@@ -35,6 +35,7 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
 
         __rvm_project_rvmrc
         __rvm_after_cd
+        __rvm_unset_exports
 
         return $result
       }
@@ -54,6 +55,7 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       __rvm_project_rvmrc
       rvm_hook="after_cd"
       source "$rvm_scripts_path/hook"
+      __rvm_unset_exports
 
       return $result
     }

diff --git a/scripts/functions/rvmrc b/scripts/functions/rvmrc
@@ -235,8 +235,6 @@ __rvm_project_rvmrc()
 
         unset rvm_rvmrc_cwd rvm_previous_environment
 
-        __rvm_unset_exports
-
       fi
 
       break
@@ -257,8 +255,6 @@ __rvm_project_rvmrc()
 
             rvm_rvmrc_cwd="$cwd"
 
-            __rvm_unset_exports
-
             source "$cwd/.rvmrc"
 
             return 0