Ensuring all vars are set for project rvmrc loading.

rvm · Feb 28, 2011 · b00382b · b00382b
1 parent 2bc17e8
commit b00382b
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/scripts/cd b/scripts/cd
@@ -11,6 +11,7 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       rvm_hook="after_cd"
 
       true ${rvm_scripts_path:="$rvm_path/scripts"}
+      source "$rvm_scripts_path/initialize"
       source "$rvm_scripts_path/hook"
 
     }
@@ -27,11 +28,12 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       cd()
       {
         builtin cd "$@"
-
         local result=$?
 
-        __rvm_project_rvmrc
+        true ${rvm_scripts_path:="$rvm_path/scripts"}
+        source "$rvm_scripts_path/initialize"
 
+        __rvm_project_rvmrc
         __rvm_after_cd
 
         return $result
@@ -44,13 +46,14 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
     cd()
     {
       builtin cd "$@"
-
       local result=$?
 
-      __rvm_project_rvmrc
-
       true ${rvm_scripts_path:="$rvm_path/scripts"}
-      rvm_hook="after_cd" ; source "$rvm_scripts_path/hook"
+      source "$rvm_scripts_path/initialize"
+
+      __rvm_project_rvmrc
+      rvm_hook="after_cd"
+      source "$rvm_scripts_path/hook"
 
       return $result
     }