scripts/rvm in rvm-1.0.2 vs scripts/rvm in rvm-1.0.3

@@ -2,16 +2,15 @@
 
 # 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}"
+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
+  rvm_reload_flag=0
 
-if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
-  unset rvm_reload_flag
-
   if [[ -z "$rvm_ignore_rvmrc" ]]; then
     for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
       if [[ -f "$rvmrc" ]] ; then
         if \grep -q '^\s*rvm .*$' $rvmrc ; then
           printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
@@ -52,17 +51,16 @@
     rvm_path="${rvm_prefix}rvm"
   fi
   rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 
   if [[ -d "$rvm_path" ]] ; then
-    source "$rvm_scripts_path/array"
-    source "$rvm_scripts_path/utility"
-    source "$rvm_scripts_path/initialize"
-    source "$rvm_scripts_path/version"
-    source "$rvm_scripts_path/selector"
-    source "$rvm_scripts_path/cli"
-    source "$rvm_scripts_path/cd"
-    source "$rvm_scripts_path/override_gem"
+    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"
+      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."
+      fi
+    done
 
     rvm_loaded_flag=1
 
     rvm_version="$(tail -n 3 < "${rvm_path}/lib/VERSION.yml" | sed -e 's/^.*: //g' | \tr "\n" '.' | sed -e 's/\.$//')" ; export rvm_version