Bugfix: rvm install X --patch Y now patches :)

rvm · Feb 9, 2010 · 9840346 · 9840346
1 parent ccacb26
commit 9840346
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/scripts/cli b/scripts/cli
@@ -174,12 +174,11 @@ __rvm_parse_args() {
 
       -h|--patch)
         if [[ -z "$rvm_ruby_patch" ]] ; then
-          export rvm_ruby_patch="$1";
+          export rvm_ruby_patch="$1"
         else
           export rvm_ruby_patch="$rvm_ruby_patch,$1";
-        fi
+        fi ; shift
         rvm_action="${rvm_action:-use}"
-        shift
       ;;
 
       --head)

diff --git a/scripts/manage b/scripts/manage
@@ -69,7 +69,7 @@ __rvm_install_source() {
 
   if [[ ! -z "$rvm_ruby_patch" ]] ; then
     for patch in $(echo $rvm_ruby_patch | tr ',' ' ') ; do
-      patch -p1 $patch
+      patch -p1 -f < $patch
     done
   fi
 

diff --git a/scripts/selector b/scripts/selector
@@ -459,11 +459,6 @@ __rvm_ruby_string() {
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_revision}"
   elif [[ ! -z "$rvm_ruby_tag" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_tag}"
-  elif [[ ! -z "$rvm_ruby_patch" ]]  ; then
-    if [[ -z "$rvm_ruby_patch_name" ]] ; then
-      rvm_ruby_patch_name="$(basename $rvm_ruby_patch | awk -F',' '{print $1}')"
-    fi
-    rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch}"
   elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
   elif [[ ! -z "$rvm_ruby_user_tag" ]]  ; then