rvm in rvm-1.0.7

- old
+ new

@@ -2,13 +2,11 @@
 
 # rvm : Ruby enVironment Manager
 # http://rvm.beginrescueend.com
 # http://github.com/wayneeseguin/rvm
 
-rvm_reload_flag=${rvm_reload_flag:-0}
-rvm_loaded_flag=${rvm_loaded_flag:-0}
-if [[ $rvm_loaded_flag -eq 0 || $rvm_reload_flag -eq 1 ]] ; then
+if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
   rvm_reload_flag=0
 
   if [[ -z "$rvm_ignore_rvmrc" ]]; then
     for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
       if [[ -f "$rvmrc" ]] ; then
@@ -48,17 +46,16 @@
   unset rvm_prefix_needs_trailing_slash
 
   if [[ -z "$rvm_path" ]] ; then
     rvm_path="${rvm_prefix}rvm"
   fi
-  rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 
   if [[ -d "$rvm_path" ]] ; then
     for script in array utility initialize version selector cli cd override_gem ; do
-      if [[ -f "$rvm_scripts_path/$script" ]] ; then
-        source "$rvm_scripts_path/$script"
+      if [[ -f "$rvm_path/scripts/$script" ]] ; then
+        source "$rvm_path/scripts/$script"
       else
-        "$rvm_scripts_path/log" "error" "RVM: Could not source script '$rvm_scripts_path/$script', file does not exist. RVM will likely not work as expected."
+        "$rvm_path/scripts/log" "error" "RVM: Could not source script '$rvm_path/scripts/$script', file does not exist. RVM will likely not work as expected."
       fi
     done
 
     rvm_loaded_flag=1
 