rvm 1.0.7 → 1.0.8

data/scripts/wrapper

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
 default_flag="$rvm_default_flag"
+
 # Prevent recursion
-unset rvm_default_flag rvm_wrapper_name
+unset rvm_default_flag rvm_wrapper_name prefix
 
 source "$rvm_path/scripts/base"
 
@@ -36,7 +37,7 @@ if [[ -s \"$rvm_path/environments/${environment_identifier}\" ]] ; then
   \\. \"$rvm_path/environments/${environment_identifier}\"
   exec $binary_name \"\$@\"
 else
-  echo \"ERROR: Missing RVM environment file: '${rvm_environments_path}/${environment_identifier}'\"
+  echo \"ERROR: Missing RVM environment file: '$rvm_path/environments/${environment_identifier}'\"
   exit 1
 fi
   " > "$file_name"
@@ -55,19 +56,26 @@ symlink_binary() {
   # 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}"
 
-    ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
+    rm -f "${rvm_bin_path:-"$rvm_path/bin"}/${prefix}_${binary_name}"
+
+    ln -fs "$file_name" "${rvm_bin_path:-"$rvm_path/bin"}/${prefix}_${binary_name}"
+
   fi
 }
 
 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_path/scripts/log" "error" "Binary '$binary_name' not found in path."
+
     return 1
+
   fi
 }
 
@@ -104,7 +112,7 @@ environment_identifier="$(__rvm_environment_identifier)"
 # it to the existing wrapper if needed.
 for binary_name in "${binaries[@]}"; do
 
-  file_name="${rvm_wrappers_path}/${environment_identifier}/${binary_name}"
+  file_name="$rvm_path/wrappers/${environment_identifier}/${binary_name}"
 
   if [[ -z "$prefix" ]] ; then
 
@@ -116,14 +124,19 @@ for binary_name in "${binaries[@]}"; do
     if [[ -f "$file_name" ]]; then
 
       if [[ "$binary_name" == "ruby" ]] ; then
-        destination="$rvm_bin_path/$environment_identifier"
+
+        destination="${rvm_bin_path:-"$rvm_path/bin"}/$environment_identifier"
+
       else
-        destination="$rvm_bin_path/${binary_name}-${environment_identifier}"
+
+        destination="${rvm_bin_path:-"$rvm_path/bin"}/${binary_name}-${environment_identifier}"
+
       fi
 
       rm -rf "$destination"
 
       ln -nsf "$file_name" "$destination"
+
     fi; unset destination
 
   elif [[ "$prefix" == "--no-prefix" ]]; then
@@ -134,7 +147,7 @@ for binary_name in "${binaries[@]}"; do
 
     if [[ -f  "$file_name" ]]; then
 
-      destination="$rvm_bin_path/$binary_name"
+      destination="${rvm_bin_path:-"$rvm_path/bin"}/$binary_name"
 
       if [[ -s "$destination" ]] ; then
         rm -rf "$destination"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 -04:00
+date: 2010-09-14 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []