Bugfix: 'rvm reload' now works again :)

rvm · Nov 27, 2009 · 80d0b54 · 80d0b54
1 parent 111ed07
commit 80d0b54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/scripts/array b/scripts/array
@@ -17,7 +17,7 @@ array_length() {
   array=$1
   eval "length=\${#${array}[*]}"
   echo $length
-  return length
+  return $length
 }
 
 array_push() {

diff --git a/scripts/cli b/scripts/cli
@@ -358,7 +358,10 @@ rvm() {
       $rvm_scripts_path/monitor ; result=$?
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload)        source "$rvm_path/scripts/rvm"      ;;
+    reload)
+      shift;shift;unset rvm_action;
+      source "$rvm_path/scripts/rvm"
+    ;;
     install|uninstall) __rvm_manage_rubies   ; result=$? ;;
     tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
 

diff --git a/scripts/monitor b/scripts/monitor
@@ -1,11 +1,15 @@
 #!/usr/bin/env bash
 
-rvm_monitor_sleep=3
+set -x
 original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
 
 source $rvm_scripts_path/rvm
 
+rvm_monitor_sleep="${rvm_monitor_sleep:-3}"
+
+trap "rm -f $rvm_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+
 timestamp() {
   if [[ "Darwin" = "$(uname)" ]] ; then
     echo $(stat -f "%m" $1)
@@ -26,8 +30,8 @@ push_if_timestamp_changed() {
 
 update_timestamp() {
   if [[ -d "${1}/" ]] ; then
-    touch "$rvm_path/${1}_timestamp"
-    eval "${1}_timestamp=\$(timestamp \"$rvm_path/${1}_timestamp\")"
+    touch "$rvm_path/${$}_${1}_timestamp"
+    eval "${1}_timestamp=\$(timestamp \"$rvm_path/${$}_${1}_timestamp\")"
   fi
 }