rvm 1.0.11 → 1.0.13

data/scripts/version

@@ -1,14 +1,17 @@
 #!/usr/bin/env bash
 
-__rvm_meta() {
+__rvm_meta()
+{
   rvm_meta_author="Wayne E. Seguin"
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
   rvm_meta_version="${rvm_version}"
 }
 
-__rvm_version() {
+__rvm_version()
+{
   __rvm_meta
+
   echo -e "\nrvm ${rvm_meta_version} by ${rvm_meta_author} (${rvm_meta_author_email}) [${rvm_meta_website}]\n"
 }
 

data/scripts/wrapper

@@ -8,7 +8,8 @@ unset rvm_default_flag rvm_wrapper_name prefix
 
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   printf "
   Usage:
 
@@ -18,12 +19,20 @@ usage() {
 
     ruby, gem, rake, irb, rdoc, ri, testrb
 
-  For more information, see 'rvm help wrapper'
+  Notes
+
+    For more information, see 'rvm help wrapper'
+
+  Example
+
+    # Wrap the spec binary as 'rails3_spec' for 1.9.2@rails3
+    rvm wrapper 1.9.2@rails3 rails3 spec
 
 "
 }
 
-wrap() {
+wrap()
+{
 
   if [[ -n "${file_name:-""}" ]] ;then
 
@@ -34,13 +43,13 @@ wrap() {
     if [[ "root" = "$USER" ]] ; then
       path="${rvm_path:-"/usr/local/rvm"}"
     else
-      path="$HOME/.rvm"
+      path="${rvm_path:-"$HOME/.rvm"}"
     fi
 
     printf "#!/usr/bin/env bash
 
 if [[ -s \"$path/environments/${environment_identifier}\" ]] ; then
-  \\. \"$path/environments/${environment_identifier}\"
+  source \"$path/environments/${environment_identifier}\"
   exec $binary_name \"\$@\"
 else
   echo \"ERROR: Missing RVM environment file: '$path/environments/${environment_identifier}'\" >&2
@@ -64,7 +73,8 @@ fi
   fi
 }
 
-symlink_binary() {
+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.
@@ -75,9 +85,11 @@ symlink_binary() {
     ln -fs "$file_name" "$rvm_bin_path/${prefix}_${binary_name}"
 
   fi
+
 }
 
-wrap_binary() {
+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
 
@@ -85,15 +97,16 @@ wrap_binary() {
 
   else
 
-    "$rvm_path/scripts/log" "error" "Binary '$binary_name' not found in path."
+    "$rvm_path/scripts/log" "error" "Binary '$binary_name' not found."
 
     return 1
 
   fi
+
 }
 
 # Empty ruby string: show usage and exit.
-if [[ "$#" -eq 0 ]] ; then
+if [[ $# -eq 0 ]] ; then
   usage
   exit 1
 else
@@ -101,12 +114,17 @@ else
   shift
 fi
 
-if [[ "$#" -gt 0 ]] ; then
+if [[ $# -gt 0 ]] ; then
   prefix="${1:-""}"
   shift
 fi
 
-binaries=($(echo "$@"))
+if [[ -z "$ruby_string" ]] ; then
+  usage
+  exit 1
+fi
+
+binaries=($@)
 override_check=0
 
 # Default the list of binaries to those we use regularily.
@@ -125,7 +143,7 @@ environment_identifier="$(__rvm_environment_identifier)"
 # it to the existing wrapper if needed.
 for binary_name in "${binaries[@]}"; do
 
-  file_name="$rvm_path/wrappers/${environment_identifier}/${binary_name}"
+  file_name="$rvm_path/wrappers/${environment_identifier}/${binary_name##*\/}"
 
   if [[ ${rvm_default_flag:-0} -gt 0 ]] ; then
 
@@ -133,6 +151,10 @@ for binary_name in "${binaries[@]}"; do
 
   fi
 
+  if [[ ! -d "$rvm_bin_path" ]] ; then
+    mkdir -p "$rvm_bin_path"
+  fi
+
   if [[ -z "$prefix" ]] ; then
 
     override_check=1
@@ -148,18 +170,17 @@ for binary_name in "${binaries[@]}"; do
 
       else
 
-        destination="$rvm_bin_path/${binary_name}-${environment_identifier}"
+        destination="$rvm_bin_path/${binary_name##*\/}-${environment_identifier}"
 
       fi
 
-      rm -rf "$destination"
+      rm -f "$destination"
 
       ln -nsf "$file_name" "$destination"
 
-    fi; unset destination
-
+    fi
 
-  elif [[ "$prefix" == "--no-prefix" ]]; then
+  elif [[ "--no-prefix" == "$prefix" ]]; then
 
     override_check=1
 
@@ -167,11 +188,11 @@ for binary_name in "${binaries[@]}"; do
 
     if [[ -f  "$file_name" ]]; then
 
-      destination="$rvm_bin_path/$binary_name"
+      destination="$rvm_bin_path/${binary_name##*\/}"
 
       if [[ -s "$destination" ]] ; then
 
-        rm -rf "$destination"
+        rm -f "$destination"
 
       fi
 
@@ -184,7 +205,6 @@ for binary_name in "${binaries[@]}"; do
 
   fi
 
-
 done
 
 exit $?

metadata

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