fetch in rvm-1.0.5

- old
+ new

@@ -6,11 +6,11 @@
 
 # Set it to cleanup the download on interruption.
 trap 'cleanup_download' 1 2 3 15
 
 cleanup_download() {
-  [[ -f "$archive" ]] && \rm -rf "$archive"
+  [[ -f "$archive" ]] && rm -rf "$archive"
 }
 
 record_md5() {
   if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
     archive_md5="$(/sbin/md5 -q "${archive}")"
@@ -43,48 +43,48 @@
 else
   fetch_command="${fetch_command} -O "
   archive=$(basename "$url")
 fi
 
-if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Fetching $archive" ; fi
+if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Fetching $archive" ; fi
 
 # Check first if we have the correct archive
 archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive" | head -n1)"
 if [[ -e "$archive" ]] && [[ ! -z "$archive_md5" ]] ; then
-  if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Found archive and its md5, testing correctness" ; fi
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Found archive and its md5, testing correctness" ; fi
   if ! "$rvm_scripts_path"/md5 "${rvm_archives_path}/${archive}" "$archive_md5" ; then
-    if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Archive is bad, downloading" ; fi
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Archive is bad, downloading" ; fi
     download=1
   else
-    if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Archive is good, not downloading" ; fi
+    if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Archive is good, not downloading" ; fi
     download=0
     result=0
   fi ; unset archive_md5
 else
-  if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "No archive or no MD5, downloading" ; fi
+  if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "No archive or no MD5, downloading" ; fi
   download=1
 fi
 
 # try to convert the ftp url to a http url
 http_url="$(echo $url | sed -e 's/ftp:/http:/' -e 's/git:/http:/')"
 
 if [[ $download -gt 0 ]] ; then
-  \rm -f $archive
+  rm -f $archive
   eval $fetch_command "$url"
   result=$?
   if [[ $result -gt 0 ]] ; then
     retry=0
     try_http=0
     if [[ $result -eq 78 ]] ; then
       "$rvm_scripts_path/log" "error" "The requested url does not exist: '$url'"
       try_http=1
     elif [[ $result -eq 18 ]] ; then
       "$rvm_scripts_path/log" "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
-      \rm -f "$archive"
+      rm -f "$archive"
       retry=1
     elif [[ $result -eq 33 ]] ; then
-      if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Server does not support 'range' command, removing '$archive'" ; fi
-      \rm -f "$archive"
+      if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then "$rvm_scripts_path/log" "debug" "Server does not support 'range' command, removing '$archive'" ; fi
+      rm -f "$archive"
       retry=1
     else
       "$rvm_scripts_path/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log. Next we'll try to fetch via http."
       try_http=1
     fi