wayneeseguin-rvm 0.0.40 → 0.0.42

data/scripts/rvm-install

@@ -14,10 +14,16 @@ if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
-echo -e "\nInstalling rvm source to ~/.rvm/scripts/rvm..."
+echo -e "\nInstalling rvm to ~/.rvm/ ..."
 for dir in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_dir/$dir
 done
+for dir in config scripts examples lib ; do
+  mkdir -p $rvm_dir/$dir
+  /bin/cp -r $source_dir/$dir/ $rvm_dir/$dir
+done
+cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
+chmod +x $rvm_dir/bin/rvm-prompt
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."
@@ -116,15 +122,6 @@ if [ -f ~/.rvm/bin/rvm ] ; then
   rm -f ~/.rvm/bin/rvm
 fi
 
-for dir in config scripts examples ; do
-  mkdir -p $rvm_dir/$dir
-  for file in `/bin/ls $source_dir/$dir/`; do
-    cp $source_dir/$dir/$file $rvm_dir/$dir/$file
-  done
-done
-cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
-cp $source_dir/VERSION.yml $rvm_dir/
-
 system=`uname`
 if [ "$system" = "Linux" ] ; then
   rvm_apt_get_binary=`which apt-get 2> /dev/null`
@@ -136,7 +133,7 @@ if [ "$system" = "Linux" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev "
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"

data/scripts/rvm-prompt

@@ -1,5 +1,5 @@
 #!/bin/bash
-if [ ! -z "$(echo `which ruby` | grep 'rvm')" ] ; then
+if [ ! -z "$(echo `which ruby` | grep '\.rvm')" ] ; then
   echo "[$(which ruby | xargs dirname | xargs dirname | xargs basename | tr '-' ':')]"
 fi
 

data/scripts/rvm-ruby-installer

@@ -4,13 +4,13 @@ function __rvm_install-source {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
-  status=0
+  result=0
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p $rvm_ruby_log_path
 
   pushd $rvm_source_path > /dev/null
 
-  if [ ! -z "$rvm_force" ] ; then
+  if [ ! -z "$rvm_force_flag" ] ; then
     rm -rf $rvm_ruby_home
     rm -rf $rvm_ruby_src_path
   fi
@@ -20,11 +20,11 @@ function __rvm_install-source {
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
       __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
       __rvm_fetch $rvm_url
-      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       __rvm_log "info" "\tExtracting $rvm_ruby_package_name ..."
       mkdir -p $rvm_ruby_src_path # Is this line necessary considering -C below?    v
       __rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
-      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     fi
   else
     __rvm_log "info" "\tRetrieving Ruby from $rvm_url"
@@ -33,14 +33,14 @@ function __rvm_install-source {
         cd $rvm_ruby_src_path
         if [ -z "$rvm_ruby_rev" ] ; then
           git pull origin master
-          if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         else
           git checkout ${rvm_ruby_rev:-HEAD}
-          if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         fi
       else
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
-        if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       fi
     else
       if [ -z "$rvm_ruby_rev" ] ; then
@@ -67,36 +67,33 @@ function __rvm_install-source {
       else
         svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path
       fi
-      if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     fi
   fi
 
   cd $rvm_ruby_src_path
-  if [ $? -gt 0 ] ; then status=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return $status ; fi
-
-  # Readline
-  if [ ! -d $rvm_path/usr/include/readline ] ; then __rvm_readline_install ; fi
+  if [ $? -gt 0 ] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return $result ; fi
 
   if [ ! -s "$rvm_ruby_src_path/configure" -a "$rvm_ruby_interpreter" = "ruby" ] ; then
     rvm_autoconf=`which autoconf`
-    if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; status=$? ; return $status ; fi
+    if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
     __rvm_run "autoconf" $rvm_autoconf
-    if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+    if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
   fi
 
-  if [ -s ./Makefile -a -z "$rvm_re_configure" ] ; then
+  if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
     __rvm_log "warn" "\tSkipping configure step, Makefile exists so configure must have already been run."
   elif [ -s ./configure ] ; then
     __rvm_log "info" "\tConfiguring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
     if [ -d $rvm_path/usr/include/readline/ ] ; then
-      parameters="$parameters --with-readline-dir=$rvm_path/usr/include/readline/"
+      configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/"
     fi
     if [ -d $rvm_path/usr/include/iconv/ ] ; then
-      parameters="$parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
+      configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
     fi
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home --enable-shared=true $rvm_ruby_configure $parameters"
-    unset parameters
-    if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters"
+    unset configure_parameters
+    if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
   else
     __rvm_log "error" "\tSkipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
@@ -107,7 +104,7 @@ function __rvm_install-source {
   else
     __rvm_run "make" $rvm_ruby_make
   fi
-  if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+  if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
   if [ -z "$rvm_ruby_make" ] ; then
     __rvm_log "info" "\tInstalling $rvm_ruby_package_name"
@@ -115,16 +112,16 @@ function __rvm_install-source {
   else
     __rvm_run "install" $rvm_ruby_make_install
   fi
-  if [ $? -gt 0 ] ; then status=$? ; return $status ; fi
+  if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
-  __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
-  __rvm_bin_script
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
 
   GEM_HOME="$rvm_gem_home" ; export GEM_HOME
   GEM_PATH="$rvm_gem_home" ; export GEM_PATH
 
   __rvm_rubygems_setup
+  __rvm_bin_script
+  __rvm_run "chmod.bin" chmod +x $rvm_ruby_home/bin/*
 
   popd > /dev/null
 
@@ -140,13 +137,15 @@ function __rvm_install-ruby {
 
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
+        #rvm_macruby_repo_url="${rvm_macruby_repo_url:-"http://svn.macosforge.org/repository/ruby/MacRuby"}"
+        rvm_macruby_repo_url="${rvm_macruby_repo_url:-"git://github.com/masterkain/macruby.git"}"
         rvm_ruby_repo_url=$rvm_macruby_repo_url
-#/macruby_nightly-2009-09-10.pkg
-        rvm_macruby_nightly_url=`__rvm_db "macruby_nightly_url"`
+        #rvm_macruby_nightly_url=`__rvm_db "macruby_nightly_url"`
         rvm_ruby_configure=""
         rvm_ruby_make="rake macruby:build framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
         rvm_ruby_make_install="rake framework:install framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
-        #rvm_ruby_rev="${rvm_ruby_rev:-head}" # Hard coding this for now
+        rvm_ruby_rev="${rvm_ruby_rev:-head}" # Hard coding this for now
+        rvm_url=$rvm_ruby_repo_url
 
         DESTDIR="$rvm_ruby_home" ; export DESTDIR
         if [ -z "$rvm_ruby_rev" ] ; then
@@ -162,9 +161,9 @@ function __rvm_install-ruby {
             rvm_ruby_rev="-r $rvm_ruby_rev"
           fi
         fi
-        __rvm_fetch $rvm_url
-        __rvm_run /usr/sbin/installer -pkg $rvm_ruby_package_name.pkg -target "$rvm_path/$rvm_ruby_package_name/"
-        #__rvm_install-source
+        #__rvm_fetch $rvm_url
+        #__rvm_run /usr/sbin/installer -pkg $rvm_ruby_package_name.pkg -target "$rvm_path/$rvm_ruby_package_name/"
+        __rvm_install-source
         unset DESTDIR
       else
         __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
@@ -181,30 +180,34 @@ function __rvm_install-ruby {
       else
         __rvm_log "info" "\tDownloading $rvm_ruby_package_name, this may take a while depending on your connection..."
         __rvm_fetch $rvm_url
-        if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; popd > /dev/null ; return 1 ; fi
+        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
         __rvm_log "info" "\tExtracting $rvm_ruby_package_name..."
         mkdir -p $rvm_ruby_src_path
         __rvm_run "extract" tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_source_path
+        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       fi
 
       __rvm_log "info" "\tInstalling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
       mkdir -p $rvm_ruby_log_path
 
       cd $rvm_ruby_src_path
+      mkdir -p $rvm_ruby_home/lib/ruby/gems/1.8/gems
       if [ ! -z "$rvm_ruby_configure" ] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
       __rvm_run "install" ./installer -a $rvm_path/ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure
+      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
       chmod +x $rvm_ruby_home/bin/*
 
-      __rvm_bin_script
       __rvm_rubygems_setup
 
-      popd > /dev/null
-
       for rvm_gem_name in rake ; do
         __rvm_log "info" "Installing $rvm_gem_name"
         __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
       done
-      ;;
+
+      __rvm_bin_script
+
+      popd > /dev/null
+    ;;
 
     rbx|rubinius)
       # TODO: check if system is 1.8.X otherwise use rvm's 1.8.X and check for parsetree, install if missing
@@ -219,17 +222,20 @@ function __rvm_install-ruby {
       #rvm_ruby_rev="head"
       # TODO: Check if already git repo, then git pull origin master && build
 
-      __rvm_bin_script
-
       if [ ! -d $rvm_ruby_home -o ! -d $rvm_ruby_home/.git ] ; then
         rm -rf $rvm_ruby_home
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_home
       fi
       cd $rvm_ruby_home
-      __rvm_run "build" $rvm_rubinius_jit rake build
+      if [ ! -z "$rvm_jit_flag" ]; then
+        __rvm_run "build" RBX_LLVM=1 rake build
+      else
+        __rvm_run "build" rake build
+      fi
       for binary in ruby irb ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary
       done
+      __rvm_bin_script
     ;;
 
     jruby)
@@ -273,15 +279,19 @@ function __rvm_install-ruby {
         ln -fs $rvm_ruby_home/bin/$binary $rvm_ruby_home/bin/${binary#j}
       done
 
+      __rvm_bin_script
+
       ln -fs $rvm_ruby_home/bin/ruby $rvm_path/bin/$rvm_ruby_package_name
       for rvm_gem_name in rake jruby-openssl ; do
         __rvm_log "info" "Installing $rvm_gem_name"
-        __rvm_run "gems" $rvm_ruby_home/bin/jgem install $rvm_gem_name --no-rdoc --no-ri -q
+        __rvm_run "gems" $rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q
       done
     ;;
 
     ruby)
-      if [ -z "rvm_ruby_configure" ] ; then rvm_ruby_configure="--enable-shared=true --enable-pthread=true " ; fi
+        # Merge configure options with user specified options
+        rvm_ruby_configure="--enable-shared=true --enable-pthread $rvm_ruby_configure "
+        if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
       __rvm_install-source $*
     ;;
 
@@ -299,12 +309,34 @@ function __rvm_install-ruby {
 
 }
 
+# TODO: DRY up __rvm_remove and __rvm_uninstall
+function __rvm_remove {
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+
+  if [ ! -z "$rvm_ruby_package_name" ] ; then
+    for dir in $rvm_source_path $rvm_path ; do
+      if [ -d $dir/$rvm_ruby_package_name ] ; then
+        __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
+        rm -rf $dir/$rvm_ruby_package_name
+      else
+        __rvm_log "info" "it seems that $dir/$rvm_ruby_package_name is already non existent."
+      fi
+      if [ -e $rvm_bin_path/$rvm_ruby_package_name ] ; then
+        rm -f $rvm_bin_path/$rvm_ruby_package_name
+      fi
+    done ; unset dir
+    rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
+  else
+    __rvm_log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
+  fi
+}
+
 function __rvm_uninstall {
 
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
 
   if [ ! -z "$rvm_ruby_package_name" ] ; then
-    for dir in $rvm_source_path $rvm_path ; do
+    for dir in $rvm_path ; do
       if [ -d $dir/$rvm_ruby_package_name ] ; then
         __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
         rm -rf $dir/$rvm_ruby_package_name
@@ -325,7 +357,7 @@ function __rvm_uninstall {
 function __rvm_post_install {
 
   for binary in gem irb erb ri rdoc testrb rake ; do
-    if [ -x $rvm_ruby_src_path/bin/$binary ] ; then
+    if [ -f $rvm_ruby_src_path/bin/$binary ] ; then
       if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" ] ; then
         cp $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
       fi
@@ -348,9 +380,9 @@ function __rvm_post_install {
   __rvm_log "info" "Installation of gems for $rvm_ruby_package_name is complete."
 
   binary=rake
-  if [ -x $rvm_ruby_src_path/bin/$binary ] ; then
-    if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" ] ; then
-      cp $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
+  if [ -x $rvm_gem_home/bin/$binary ] ; then
+    if [ "$rvm_gem_home" != "$rvm_ruby_home" ] ; then
+      cp $rvm_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
     fi
     # TODO: Account for rubygem installed rake vs system rake
     string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_gem_home/bin:' + ENV['PATH']"
@@ -376,16 +408,11 @@ function __rvm_rubygems_setup {
       mkdir -p $rvm_source_path/$rvm_gem_package_name
       __rvm_run "rubygems.extract" tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_source_path
     fi
-    # Well this is fun... fix nil error on require_paths:
-    # Q: Is this necessary any longer?
-    #sed -i.orig "s/require_paths\.join/require_paths.to_a.join/" $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb
-    #rm -f $rvm_source_path/$rvm_gem_package_name/lib/rubygems/gem_path_searcher.rb.orig
-    __rvm_run "rubygems.install" GEM_HOME=$rvm_gem_path GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
-    status=$?
-    if [ $status -eq 0 ] ; then
+    __rvm_run "rubygems.install" GEM_PATH=$rvm_gem_path GEM_HOME=$rvm_gem_home $rvm_ruby_home/bin/ruby $rvm_source_path/$rvm_gem_package_name/setup.rb
+    result=$?
+    if [ $result -eq 0 ] ; then
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
     fi
-    if [ $status -eq 0 ] ; then status=$? ; fi
   else
     # 1.9 has it's own built gem command, let's adjust the shebang line.
     mv $rvm_ruby_src_path/bin/gem $rvm_ruby_src_path/bin/gem.orig
@@ -394,6 +421,6 @@ function __rvm_rubygems_setup {
     __rvm_run "rubygems.update" $rvm_ruby_home/bin/gem update --system
   fi
 
-  return $status
+  return $result
 }
 

data/scripts/rvm-selector

@@ -3,7 +3,7 @@
 # __rvm_select implementation version patch_level
 function __rvm_select {
 
-  __rvm_ruby_string
+  if [ ! -z "$rvm_ruby_string" ] ; then __rvm_ruby_string ; fi
 
   rvm_ruby_interpreter="${1:-$rvm_ruby_interpreter}"
   rvm_ruby_interpreter="${rvm_ruby_interpreter:-ruby}" # Default is standard ruby
@@ -22,9 +22,11 @@ function __rvm_select {
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-`__rvm_db "macruby_repo_url"`}"
-        rvm_ruby_version="${rvm_ruby_version:-`__rvm_db "macruby_version"`}"
-        rvm_ruby_package_name=${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}
-        rvm_url="http://dl.getdropbox.com/u/163257/$rvm_ruby_package_name.pkg" # For now we are only supporting the 'nightly' builds
+        rvm_ruby_version="head"
+        rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
+        #rvm_ruby_version="${rvm_ruby_version:-`__rvm_db "macruby_version"`}"
+        #rvm_ruby_package_name=${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}
+        #rvm_url="http://dl.getdropbox.com/u/163257/$rvm_ruby_package_name.pkg" # 'nightly' builds
         unset rvm_ruby_patch_level
       else
         __rvm_log "fail" "MacRuby can only be installed on a Darwin OS."
@@ -67,8 +69,9 @@ function __rvm_select {
         rvm_ruby_version=$(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print 1 "." $2 "." $3 }')
         rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print $4 }')
       fi
-
-      rvm_ruby_version=${rvm_ruby_version:-`__rvm_db "ruby_version"`} # Default verison is 1.8.6
+      if [ -z "$rvm_ruby_version" ] ; then
+        rvm_ruby_version=`__rvm_db "ruby_version"` # Default verison is 1.8.6
+      fi
       rvm_ruby_patch_level=${rvm_ruby_patch_level:-`__rvm_db "ruby_${rvm_ruby_version}_patch_level"`} # Default verison is 1.8.6
       if [ -z "rvm_ruby_patch_level" ] ; then unset rvm_ruby_patch_level ; fi
 
@@ -107,17 +110,17 @@ function __rvm_select {
       fi
     fi
 
-    if [ ! -z "$rvm_load" ] ; then __rvm_gemset_load ; fi
-    if [ ! -z "$rvm_dump" ] ; then __rvm_gemset_dump ; fi
-
     mkdir -p $rvm_gem_home
 
     if [ -z "$rvm_ruby_patch_level" ] ; then
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"}"
     else
-      if [ "`echo $rvm_ruby_patch_level | awk '{print substr($1, 0, 1)}'`" != "p" ] ; then
-        rvm_ruby_patch_level="p$rvm_ruby_patch_level"
+      if [ "$rvm_ruby_interpreter" != "ruby-enterprise" ] ; then
+        if [ ! -z "`echo $rvm_ruby_patch_level | awk '/[0-9]+/{print}'`" ] ; then
+          rvm_ruby_patch_level="p$rvm_ruby_patch_level"
+        fi
+        rvm_ruby_patch_level="`echo $rvm_ruby_patch_level | sed 's/^pp/p/'`" # sanity check, thanks sfpyra
       fi
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
@@ -129,7 +132,10 @@ function __rvm_select {
     rvm_ruby_string="$rvm_ruby_package_name"
     rvm_selected=1
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_version rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_package_name rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_rev rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_gem_home rvm_path rvm_source_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_source_path rvm_ruby_src_path rvm_ruby_irbrc rvm_selected rvm_ruby_string
+
+    if [ ! -z "$rvm_load_flag" ] ; then __rvm_gemset_load ; fi
+    if [ ! -z "$rvm_dump_flag" ] ; then __rvm_gemset_dump ; fi
 
   else
     rvm_gem_home=$GEM_HOME
@@ -156,6 +162,7 @@ function __rvm_use {
   elif [ "$rvm_ruby_interpreter" = "system" ] ; then
 
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
+    # TODO: Remove .rvm/bin from the path
     PATH="$rvm_system_path" ; export PATH
     if [ -s $rvm_path/system ] ; then
       grep "^MY_RUBY_HOME='$rvm_path" "$rvm_path/system" > /dev/null
@@ -174,15 +181,9 @@ function __rvm_use {
     IRBRC="$rvm_ruby_irbrc" ; export IRBRC
     if [ -z "$IRBRC" ] ; then unset IRBRC ; fi
 
-    # Install if not installed
     if [ ! -d $MY_RUBY_HOME ] ; then
       __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_version is not installed."
-      echo -n -e "Would you like rvm to install $rvm_ruby_interpreter $rvm_ruby_version for you now?\n(Y/n) ? "
-      read response
-      if [ "$response" = 'n' ] ; then
-        __rvm_log "warn" "Please run 'rvm install $rvm_ruby_interpreter $rvm_ruby_version' if you wish to use it.\n"
-        return 0
-      else
+      if [ ! -z "$rvm_install_on_use" ] ; then
         __rvm_install-ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
       fi
     fi
@@ -191,7 +192,7 @@ function __rvm_use {
 
     PATH="$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$rvm_system_path" ; export PATH
 
-    if [ ! -z "$rvm_set_default" ] ; then
+    if [ ! -z "$rvm_default_flag" ] ; then
       RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
@@ -213,13 +214,9 @@ function __rvm_use {
         ln -fs $rvm_path/bin/gem-$rvm_ruby_package_name $rvm_path/bin/gem
         ln -fs $rvm_path/bin/irb-$rvm_ruby_package_name $rvm_path/bin/irb
       else
-        rm -f $rvm_path/bin/ruby
-        rm -f $rvm_path/bin/default-ruby
-        rm -f $rvm_path/bin/gem
-        rm -f $rvm_path/bin/irb
+        rm -f $rvm_path/bin/ruby $rvm_path/bin/default-ruby $rvm_path/bin/gem $rvm_path/bin/irb
       fi
-
-      unset rvm_set_default
+      unset rvm_default_flag
     fi
   fi
 }