wrapper in rvm-1.0.5

- old
+ new

@@ -9,12 +9,12 @@
 full_binary_name() {
   echo "$binary_name" | __rvm_strip
 }
 
 wrap() {
-  \mkdir -p "$(dirname "$file_name")"
-  \rm -f "$file_name"
+  mkdir -p "$(dirname "$file_name")"
+  rm -f "$file_name"
 
   printf "#!/usr/bin/env sh\n
 if [ -s \"${rvm_environments_path}/${environment_identifier}\" ] ; then
   \\. \"${rvm_environments_path}/${environment_identifier}\"
   exec $binary_name \"\$@\"
@@ -30,11 +30,11 @@
 symlink_binary() {
   # Generate the default wrapper with the given binary name.
   # We first check if we can wrap the binary and if we were able to,
   # we then symlink it into place.
   if wrap_binary && [[ -f "$file_name" ]]; then
-    \rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
+    rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
     ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
   fi
 }
 
 wrap_binary() {
@@ -54,13 +54,13 @@
 }
 
 # Empty ruby string: show usage and exit.
 if [[ -z "$1" ]]; then usage ; exit 1 ; fi
 
-ruby_string="$1"; shift
+ruby_string="${1:-""}"; shift
 override_check=0
-prefix="$1"
+prefix="${1:-""}"
 [[ "$#" -gt 0 ]] && shift
 binaries="$(echo "$@" | __rvm_strip)"
 
 # Default the list of binaries to those we use regularily.
 if [[ -z "$binaries" ]] ; then
@@ -76,32 +76,35 @@
 
 # For each binary, we want to generate the wrapper / symlink
 # it to the existing wrapper if needed.
 for binary_name in $binaries; do
   file_name="${rvm_wrappers_path}/${environment_identifier}/${binary_name}"
+
   if [[ -z "$prefix" ]] ; then
     override_check=1
     wrap_binary
     # Symlink it into place.
     if [[ -f "$file_name" ]]; then
       if [[ "$binary_name" == "ruby" ]] ; then
         destination="$rvm_bin_path/$environment_identifier"
       else
         destination="$rvm_bin_path/${binary_name}-${environment_identifier}"
       fi
-      \rm -rf "$destination"
+      rm -rf "$destination"
       ln -nsf "$file_name" "$destination"
     fi; unset destination
+
   elif [[ "$prefix" == "--no-prefix" ]]; then
     override_check=1
     wrap_binary
     if [[ -f  "$file_name" ]]; then
       destination="$rvm_bin_path/$binary_name"
-      \rm -rf "$destination"
+      rm -rf "$destination"
       ln -nsf "$file_name" "$destination"
     fi; unset destination
+
   else
     symlink_binary
-  fi ; unset file_name
+  fi
 done
 
 exit $?