wrapper in rvm-1.0.2

- old
+ new

@@ -12,20 +12,21 @@
 
 wrap() {
   \mkdir -p "$(dirname "$file_name")"
   \rm -f "$file_name"
 
-  echo "#!/usr/bin/env sh" > "$file_name"
-  echo "if [ -s \"${rvm_environments_path}/${environment_identifier}\" ] ; then" >> "$file_name"
-  echo "  \\. \"${rvm_environments_path}/${environment_identifier}\"" >> "$file_name"
-  echo "  exec $binary_name \"\$@\"" >> "$file_name"
-  echo "else" >> $file_name
-  echo "  echo \"ERROR: Missing RVM environment file: '${rvm_environments_path}/${environment_identifier}'\"" >> $file_name
-  echo "  exit 1" >> $file_name
-  echo "fi" >> $file_name
+  printf "#!/usr/bin/env sh\n
+if [ -s \"${rvm_environments_path}/${environment_identifier}\" ] ; then
+  \\. \"${rvm_environments_path}/${environment_identifier}\"
+  exec $binary_name \"\$@\"
+else
+  echo \"ERROR: Missing RVM environment file: '${rvm_environments_path}/${environment_identifier}'\"
+  exit 1
+fi
+  " > "$file_name"
 
-  if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
+  if [[ -f "$file_name" ]] ; then chmod +x "$file_name" ; fi
 }
 
 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,
@@ -39,11 +40,11 @@
 wrap_binary() {
   # We wrap when the given binary is in the path or override_check is set to one.
   if [[ "$override_check" = "1" ]] || command -v $binary_name > /dev/null; then
     wrap
   else
-    $rvm_scripts_path/log "error" "Binary '$binary_name' not found in path."
+    "$rvm_scripts_path/log" "error" "Binary '$binary_name' not found in path."
     return 1
   fi
 }
 
 usage() {
@@ -51,21 +52,15 @@
   printf "        Where binary defaults to ruby, gem, rake, irb, rdoc, ri, testrb\n"
   printf "        For more information, see 'rvm help wrapper'\n"
 }
 
 # Empty ruby string: show usage and exit.
+if [[ -z "$1" ]]; then usage ; exit 1 ; fi
 
-if [[ -z "$1" ]]; then
-  usage
-  exit 1
-fi
-
 ruby_string="$1"; shift
-
 override_check=0
 prefix="$1"
 [[ "$#" -gt 0 ]] && shift
-
 binaries="$(echo "$@" | __rvm_strip)"
 
 # Default the list of binaries to those we use regularily.
 if [[ -z "$binaries" ]] ; then
   binaries="ruby gem irb ri rdoc rake erb testrb"