rvm 0.0.97 → 0.0.98

data/README

@@ -35,6 +35,7 @@ Implementation
   jruby     - JRuby
   rbx       - rubinius
   ree       - ruby Enterprise Edition
+  ironruby  - IronRuby
   mput      - shyouhei(mput)'s github repository
   system    - use the system ruby (eg. pre-rvm state)
   default   - use rvm set default ruby and system if it hasn't been set.

data/binscripts/rvm-prompt

@@ -10,7 +10,7 @@ add(){
   fi
 }
 
-if which ruby 2>/dev/null | grep -q 'rvm' ; then
+if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
   unset format
   while [[ $# -gt 0 ]] ; do
     token="$1" ; shift
@@ -31,11 +31,18 @@ if which ruby 2>/dev/null | grep -q 'rvm' ; then
   fi
 
   ruby_string=$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)
-
-  (( $interpreter_flag ))  && interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
-  (( $version_flag ))      && version="$(echo $ruby_string | awk -F'-' '{print $2}')"
-  (( $patchlevel_flag ))   && patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
-  (( $architecture_flag )) && architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
+  if [[ ! -z "$interpreter_flag" ]] ; then
+    interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
+  fi
+  if [[ ! -z "$version_flag" ]] ; then
+    version="$(echo $ruby_string | awk -F'-' '{print $2}')"
+  fi
+  if [[ ! -z "$patchlevel_flag" ]] ; then
+    patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
+  fi
+  if [[ ! -z "$architecture_flag" ]] ; then
+    architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
+  fi
 
   command="prompt=\"[$format]\""
   eval "$command"
@@ -43,3 +50,4 @@ if which ruby 2>/dev/null | grep -q 'rvm' ; then
 fi
 
 exit 0
+

data/binscripts/rvmsudo

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+eval "sudo GEM_HOME=$GEM_HOME GEM_PATH=$GEM_PATH PATH=$PATH" "$@"

data/config/db

@@ -22,8 +22,8 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
 ree_1.8.7_url=http://rubyforge.org/frs/download.php/66162
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2009.10
-rbx_version=1.0.0-rc1
-rbx_patch_level=20091125
+rbx_version=1.0.0
+rbx_patch_level=rc1
 rbx_url=http://asset.rubini.us/rubinius-1.0.0-rc1-20091125.tar.gz
 ruby_1.9.1_patch_level=376
 ruby_1.9.2_patch_level=preview1

data/install

@@ -3,7 +3,7 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
+if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
@@ -12,6 +12,7 @@ if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   fi
 fi
 
+source scripts/utility
 source scripts/initialize
 
 #
@@ -54,7 +55,7 @@ fi
 echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
-for file in rvm-prompt rvm ; do
+for file in rvm-prompt rvm rvmsudo ; do
   cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
@@ -68,7 +69,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] ; then
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
     if [[ -s "$HOME/.profile" ]] ; then
       if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
         echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
       fi
     fi
@@ -81,6 +82,7 @@ fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
   chmod +x $rvm_symlink_path/rvm
 fi

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 97
+:patch: 98

data/rvm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.97"
+  s.version = "0.0.98"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-12-17}
+  s.date = %q{2009-12-21}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      "README",
      "binscripts/rvm",
      "binscripts/rvm-prompt",
+     "binscripts/rvmsudo",
      "config/db",
      "config/md5",
      "examples/rvmrc",
@@ -89,4 +90,3 @@ Gem::Specification.new do |s|
   else
   end
 end
-

data/scripts/cli

@@ -49,7 +49,7 @@ __rvm_parse_args() {
         rvm_ruby_string="$rvm_token"
       ;;
 
-      jruby|ree|macruby|rbx|rubinius|mput|shyouhei|default|all)
+      jruby|ree|macruby|rbx|rubinius|mput|shyouhei|ironruby|default|all)
         rvm_ruby_interpreter="$rvm_token"
         rvm_ruby_string="$rvm_token"
         rvm_action="${rvm_action:-use}"
@@ -110,7 +110,7 @@ __rvm_parse_args() {
               rvm_ruby_version=$(echo "$1" | tr ',' ' ') ; shift
               unset rvm_ruby_interpreter
             else
-              if $rvm_scripts_path/match "rbx jruby rubinius macruby ree mput shyouhei" "$1" ; then
+              if $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius mput shyouhei ironruby" "$1" ; then
                 rvm_ruby_interpreter=$1 ; shift
               else
                 unset rvm_ruby_interpreter rvm_ruby_version
@@ -266,8 +266,10 @@ __rvm_parse_args() {
       tests|specs)          rvm_action="tests"                  ;;
       --trace)              export rvm_trace_flag=1    ; set -x ;;
       --symlink)            rvm_symlink_name="$1"      ; shift  ;;
+      --disable-llvm|--disable-jit) export rvm_jit_flag=0       ;;
+      --enable-llvm|--enable-jit)   export rvm_jit_flag=1       ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--load|--passenger|--editor)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
         if [[ "--debug" = "$rvm_token" ]] ; then export rvm_debug_flag ; fi
       ;;
@@ -428,9 +430,9 @@ rvm() {
       result=1
   esac
 
-  if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi
+  if [[ ! -z "$rvm_reload_flag" ]] ; then source "$rvm_path/scripts/rvm" ; fi
 
-  if [[ "$rvm_trace_flag" -eq 1 ]] ; then set +x ; unset rvm_trace_flag ; fi
+  if [[ ! -z "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
 
   return $result
 }

data/scripts/completion

@@ -123,7 +123,6 @@ function _rvm {
 
   __rvm_cleanup_variables
   __rvm_load_rvmrc
-  __rvm_initialize
   __rvm_load_defaults
   __rvm_parse_args $@
 

data/scripts/fetch

@@ -13,22 +13,22 @@ if [[ -z "$1" ]] ; then $rvm_scripts_path/log "fail" "BUG: $0 called without an
 
 archive=$(basename "$1") ; downlaod=1
 
-(( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Fetching $archive"
+if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Fetching $archive" ; fi
 
 # Check first if we have the correct archive
 archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive")"
 if [[ -e "$archive" ]] && [[ ! -z "$archive_md5" ]] ; then
-  (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Found archive and its md5, testing correctness"
+  if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Found archive and its md5, testing correctness" ; fi
   if [[ $($rvm_scripts_path/md5 $archive $archive_md5) -gt 0 ]] ; then
-    (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Archive is bad, downloading"
+    if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Archive is bad, downloading" ; fi
     download=1
   else
-    (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Archive is good, not downloading"
+    if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Archive is good, not downloading" ; fi
     download=0
     result=0
   fi ; unset archive_md5
 else
-  (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "No archive or no MD5, downloading"
+  if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "No archive or no MD5, downloading" ; fi
   download=1
 fi
 
@@ -44,7 +44,7 @@ if [[ $download -gt 0 ]] ; then
       rm -f "$archive"
       retry=1
     elif [[ $result -eq 33 ]] ; then
-      (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Server does not support 'range' command, removing '$archive'"
+      if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Server does not support 'range' command, removing '$archive'" ; fi
       rm -f "$archive"
       retry=1
     else

data/scripts/gems

@@ -22,7 +22,7 @@ __rvm_gems_dir() {
 
 __rvm_gems_list() {
   if [[ $rvm_dir =~ rvm ]] ; then
-    for gemdir in $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%* ; do
+    for gemdir in "${rvm_gem_path}"/${rvm_ruby_string}%* ; do
       echo "$gemdir" | awk -F'%' '{print $2}'
     done
   fi
@@ -30,7 +30,7 @@ __rvm_gems_list() {
 
 __rvm_gems_delete() {
   if [[ ! -z "$rvm_gem_set_name" ]] ; then
-    gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
+    gemdir="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
     if [[ -d "$gemdir" ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
@@ -64,9 +64,10 @@ __rvm_gems_dump() {
     fi
   fi
 
+  $rvm_scripts_path/log "info" "Dumping current environments gems to $rvm_file_name"
+
   touch $rvm_file_name
   echo "# $rvm_file_name generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
-
   for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';') ; do
     name="$(echo $gem | awk -F';' '{print $1}')"
     if [[ -z "$rvm_latest_flag" ]] ; then
@@ -114,8 +115,7 @@ __rvm_gems_load() {
 
     while read -r line
     do # Keep this on 2nd line :(
-      __rvm_parse_gem_line $line
-      __rvm_gem_install
+      __rvm_gem_install $line
     done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
   else
     $rvm_scripts_path/log "error" "$rvm_file_name does not exist to load from."
@@ -156,7 +156,7 @@ __rvm_parse_gem_line() {
 __rvm_gem_install() {
   __rvm_parse_gem_line $*
 
-  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}spec 2>/dev/null | head -n 1)"
+  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}*spec 2>/dev/null | head -n 1)"
   if [[ -z "$rvm_force_flag" ]] && [[ -f "$installed_gem" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
@@ -202,19 +202,17 @@ __rvm_gem_install() {
     # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
     if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
 
-    $rvm_scripts_path/log "warn" "$gem_name $gem_version is not installed, installing..."
     if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
     else
-      command="$gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+      command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
     fi
-
-    eval $command >> "$rvm_path/log/$rvm_ruby_string/gem.install.log" 2>> "$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
+    __rvm_run "gem.install" "$command" "$gem_name $gem_version is not installed, installing..."
     result=$?
     if [[ $result -eq 0 ]] ; then
       $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$color_none installed."
     else
-      $rvm_scripts_path/log "error" "$color_red$gem_name $gem_version$color_none failed to install, output logged to $rvm_path/log/$rvm_ruby_string/gem.install.error.log"
+      $rvm_scripts_path/log "error" "$color_red$gem_name $gem_version$color_none failed to install, output has been logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
     fi
   fi ; unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
   return $result

data/scripts/initialize

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
 if [[ "root" = "$(whoami)" ]] ; then
-  rvm_rc_files="/etc/profile /etc/zshenv"
+  rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
-  rvm_rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
+  rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
 if [[ ! -z "$rvm_archflags" ]] ; then rvm_make_flags_flag=1 ; fi
 
 rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
 rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-0}"
+
 if [[ -z "$rvm_scripts_path" ]] ; then
   if [[ -d "$HOME/scripts" ]] && [[ -f "/usr/local/rvm/scripts/rvm" ]]; then
     rvm_scripts_path="$HOME/scripts"
@@ -19,6 +20,7 @@ if [[ -z "$rvm_scripts_path" ]] ; then
     rvm_scripts_path="$rvm_path/scripts"
   fi
 fi
+
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
@@ -31,3 +33,4 @@ rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
 
 export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path
 
+__rvm_initialize

data/scripts/install

@@ -3,7 +3,7 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
+if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
@@ -12,6 +12,7 @@ if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   fi
 fi
 
+source scripts/utility
 source scripts/initialize
 
 #
@@ -54,7 +55,7 @@ fi
 echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
-for file in rvm-prompt rvm ; do
+for file in rvm-prompt rvm rvmsudo ; do
   cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
@@ -68,7 +69,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] ; then
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
     if [[ -s "$HOME/.profile" ]] ; then
       if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
         echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
       fi
     fi
@@ -81,6 +82,7 @@ fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
   chmod +x $rvm_symlink_path/rvm
 fi

data/scripts/libraries

@@ -4,7 +4,7 @@
 # ruby supporting libraries:
 #
 __rvm_readline_install() {
-  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="readline" ; version="5.2" ; archive_format="tar.gz"
   # TODO: Figure out how to list, grab and apply the patches
@@ -35,7 +35,7 @@ __rvm_readline_install() {
 }
 
 __rvm_iconv_install() {
-  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   __rvm_pushpop $rvm_src_path
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
@@ -54,7 +54,7 @@ __rvm_iconv_install() {
 }
 
 __rvm_curl_install() {
-  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
@@ -72,7 +72,7 @@ __rvm_curl_install() {
 }
 
 __rvm_openssl_install() {
-  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
     openssl_os="os/compiler darwin64-x86_64-cc"
   else
@@ -95,7 +95,7 @@ __rvm_openssl_install() {
 }
 
 __rvm_zlib_install() {
-  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
@@ -113,7 +113,7 @@ __rvm_zlib_install() {
 }
 
 __rvm_ncurses_install() {
-  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   __rvm_pushpop $rvm_src_path
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package"
@@ -131,7 +131,7 @@ __rvm_ncurses_install() {
 }
 
 __rvm_install_llvm() {
-  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   builtin cd "$rvm_src_path"
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
     rm -rf "$rvm_src_path/llvm"

data/scripts/manage

@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
-
 original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
 
-source $rvm_scripts_path/rvm
+source $rvm_scripts_path/initialize
+source $rvm_scripts_path/utility
+source $rvm_scripts_path/selector
 
 trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
 __rvm_install_source() {
-  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+
   $rvm_scripts_path/log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p "$rvm_ruby_log_path"
   __rvm_pushpop "$rvm_src_path"
@@ -77,8 +80,7 @@ __rvm_install_source() {
 }
 
 __rvm_install_ruby() {
-
-  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$RUBYOPT" ]] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
 
@@ -191,10 +193,12 @@ RubyWrapper
     rbx|rubinius)
       $rvm_scripts_path/log "info" "Installing pre-requisites"
       # prereqs, 1.8.6+ + rake. Yes this could all be one line... not pushing our luck.
-      echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.7)" # This should install if missing.
+      original_string="$rvm_ruby_string"
+      export rvm_install_on_use_flag=1 ; $rvm_bin_path/rvm 1.8.7 --install # This should install if missing.
       # TODO: use 'rvm gems load' here:
       unset CFLAGS LDFLAGS ARCHFLAGS # Important.
-      __rvm_unset_ruby_variables ; rvm_ruby_string="rbx-head" ; __rvm_select
+      __rvm_unset_ruby_variables ; rvm_ruby_string="$original_string" ; __rvm_select
+      unset original_string
 
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
@@ -205,8 +209,8 @@ RubyWrapper
           $rvm_scripts_path/log "info" "Downloading $rvm_ruby_file, this may take a while depending on your connection..."
           $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
         fi
-        __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_file.tar.gz ..." || (result=$? && return $result)
-        mv $rvm_src_path/rubinius-$rvm_ruby_version $rvm_ruby_src_path
+        __rvm_run "extract" "tar xzf $rvm_archives_path/$(basename $rvm_url) -C $rvm_src_path" "Extracting $(basename $rvm_url) ..." || (result=$? && return $result)
+        mv "$rvm_src_path/rubinius-$rvm_ruby_version-${rvm_ruby_patch_level/^p//}" $rvm_ruby_src_path
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
         #rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
@@ -224,73 +228,55 @@ RubyWrapper
       #  __rvm_run "rake.distclean" "\$(rvm 1.8.7 ; rake distclean --trace)" "Running distclean."
       #fi
 
-      # For Installer, can do this once it's ready:
-      # RBX_PREFIX="$rvm_ruby_home" ; export RBX_PREFIX
-      # Also see 'rakelib/configuration.rake'
-
       builtin cd "$rvm_ruby_src_path"
-      # TODO: Once installer is done add the prefix:
-      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home --disable-llvm" ; message="Configuring rbx"
-      #rvm_ruby_configure="./configure" ; message="Configuring rbx"
-      if [[ ! -z "$rvm_jit_flag" ]] ; then
+      chmod +x ./configure
+      rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
+
+      if [[ "$rvm_jit_flag" -eq 0 ]] && [[ "rc1" != "$rvm_ruby_patch_level" ]] ; then
+        rvm_ruby_configure="$rvm_ruby_configure --disable-llvm" ; message="$message with LLVM disabled"
+      else
         rvm_ruby_configure="$rvm_ruby_configure" ; message="$message with LLVM enabled"
       fi
+
       __rvm_run "configure" "$rvm_ruby_configure" "$message"
 
       if [[ "$rvm_trace_flag" -eq 1 ]] ; then
-        rvm_ruby_make="\$(rvm 1.8.7 ; rake install --trace)" ; message="Compiling rbx"
+        rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 rake install --trace" ; message="Compiling rbx"
       else
-        rvm_ruby_make="\$(rvm 1.8.7 ; rake install)" ; message="Compiling rbx"
+        rvm_ruby_make="$rvm_bin_path/rvm 1.8.7 rake install" ; message="Compiling rbx"
       fi
       __rvm_run "rake" "$rvm_ruby_make" "$message"
 
-      # TODO: Uncomment the following once --prefix is working properly again
-      #rvm_ruby_make_install="\$(rvm 1.8.7 ; rake install --trace)" ; message="Installing rbx"
-      #__rvm_run "rake.install" "$rvm_ruby_make" "$message"
-
       binaries="ruby irb" # Trick to work in more shells :)
       for binary_name in $(echo $binaries) ; do
         ln -fs $rvm_ruby_home/bin/rbx $rvm_ruby_home/bin/$binary_name
       done ; unset binary_name binaries
 
-      binaries="erb ri rdoc"
-      __rvm_post_install
+      for binary_name in "gem" ; do
+        if [[ $binary_name != "gem" ]] ; then prefix="-S " ; else unset prefix; fi
 
-      binaries="gem" # Trick to work in more shells :)
-      for binary_name in $(echo $binaries); do
-        if [[ $binary_name != "gem" ]] ; then prefix="-S" ; fi
         ruby_wrapper=$(cat <<RubyWrapper
-#!/bin/bash
+#!/usr/bin/env bash
 
 GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
 GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
 MY_RUBY_HOME="$rvm_ruby_home" ; export MY_RUBY_HOME
 PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 
-exec $rvm_ruby_home/bin/rbx $prefix $binary_name "\$@"
+exec $rvm_ruby_home/bin/rbx $prefix$binary_name "\$@"
 RubyWrapper
 )
-        files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_string"
-        for file_name in $(echo $files)  ; do
+        for file_name in "$rvm_ruby_home/bin/$binary_name" "$rvm_path/bin/$binary_name-$rvm_ruby_string"  ; do
           rm -f $file_name
           echo "$ruby_wrapper" > $file_name
           if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
-        done ; unset file_name
-        unset ruby_wrapper binary_name files prefix
-      done
+        done
 
-      __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
-
-      binary=rake
-      if [[ -f $rvm_ruby_gem_home/bin/$binary ]] ; then
-        if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then
-          cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
-        fi
-        chmod +x $rvm_ruby_home/bin/$binary
-        __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
-        __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
-      fi ; unset binary
+        unset file_name binaries ruby_wrapper binary_name files prefix
+      done ; unset binary_name
 
+      binaries="erb ri rdoc"
+      __rvm_post_install
       __rvm_irbrc
       __rvm_bin_script
     ;;
@@ -300,16 +286,17 @@ RubyWrapper
         echo -e "java must be installed and in your path in order to install JRuby." ; return 1
       fi
 
-      mkdir -p "$rvm_ruby_log_path"  "$rvm_ruby_src_path"
+      mkdir -p "$rvm_ruby_log_path" "$rvm_ruby_src_path"
       __rvm_pushpop $rvm_src_path
       __rvm_fetch_ruby || (result=$? && return $result)
-      (( $rvm_head_flag )) || __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+
+      # if [[ -z "$rvm_head_flag" ]] ; then __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..." ; fi
 
       builtin cd "$rvm_ruby_src_path"
-      (( $rvm_head_flag )) && (( $rvm_ruby_version )) && ant dist
+      if [[ ! -z "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
 
       mkdir -p "$rvm_ruby_home/bin/"
-      __rvm_run "nailgun" "builtin cd "$rvm_ruby_src_path/tool/nailgun" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags"
+      __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags" "Building Nailgun"
 
       __rvm_pushpop
 
@@ -342,13 +329,46 @@ RubyWrapper
         echo -e "mono must be installed and in your path in order to install IronRuby." ; return 1
       fi
 
-      $rvm_scripts_path/log "info" "Retrieving IronRuby"
-      $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
+      if [[ "$rvm_head_flag" = 1 ]] ; then
+          mono_version="$(mono -V | head -n 1 | cut -d ' ' -f5)"
+          if [[ "$mono_version" =~ ([0-9]+)\.([0-9]+)\.?([0-9]+)? ]] ; then
+            if [[ ${BASH_REMATCH[1]} -lt 2 ]] || ( [[ ${BASH_REMATCH[1]} -eq 2 ]] && [[ ${BASH_REMATCH[2]} -lt 6 ]] ) ; then
+              echo -e "Mono 2.6 (or greater) must be installed and in your path in order to build IronRuby from the repository."
+              echo -e "Version detected: ${BASH_REMATCH[0]}"
+              return 1
+            fi
+          else
+            echo -e "Cannot recognize mono version."
+            return 1
+          fi
 
-      __rvm_run "extract" "unzip $rvm_archives_path/$rvm_ruby_package_file ironruby/bin/* ironruby/lib/* -d $rvm_ruby_home" "Extracting $rvm_ruby_package_file ..."
-      mv $rvm_ruby_home/ironruby/* $rvm_ruby_home
-      rm -rf $rvm_ruby_home/ironruby
-      mv $rvm_ruby_home/lib/ironruby $rvm_ruby_home/lib/IronRuby
+          __rvm_fetch_ruby
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+
+          builtin cd $rvm_ruby_src_path
+
+          rvm_ruby_make="rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
+          __rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+
+          rm -rf $rvm_ruby_home/*
+          mkdir -p $rvm_ruby_home/bin $rvm_ruby_home/lib $rvm_ruby_home/lib/ruby $rvm_ruby_home/lib/IronRuby
+
+          cp -r $rvm_ruby_src_path/Merlin/Main/Bin/mono_release/* $rvm_ruby_home/bin/
+          cp -r $rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Scripts/bin/* $rvm_ruby_home/bin/
+          cp -r $rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p*/lib/ruby/* $rvm_ruby_home/lib/ruby
+          cp -r $rvm_ruby_src_path/ruby_home/lib/IronRuby
+      else
+        $rvm_scripts_path/log "info" "Retrieving IronRuby"
+        $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
+
+        __rvm_run "extract" "unzip $rvm_archives_path/$rvm_ruby_package_file ironruby/bin/* ironruby/lib/* -d $rvm_ruby_home" "Extracting $rvm_ruby_package_file ..."
+        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+
+        mv $rvm_ruby_home/ironruby/* $rvm_ruby_home
+        rm -rf $rvm_ruby_home/ironruby
+        mv $rvm_ruby_home/lib/ironruby $rvm_ruby_home/lib/IronRuby
+      fi
 
       binaries="gem irb rake rdoc ri ruby"
       for binary_name in $(echo $binaries); do
@@ -383,12 +403,7 @@ RubyWrapper
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
-      unset rvm_ruby_configure
-      rvm_ruby_src_path=$rvm_ruby_home
-      # rvm_ruby_make="rake"
-      # rvm_ruby_make_install="rake install"
       rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
-      # rvm_ruby_revision="head"
 
       if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
         rm -rf $rvm_ruby_src_path
@@ -399,6 +414,8 @@ RubyWrapper
         __rvm_run "mput.repo" "git pull origin trunk" "Pulling from origin trunk"
       fi
 
+      builtin cd $rvm_ruby_src_path
+
       if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
         if which autoconf &> /dev/null ; then
           __rvm_run "autoconf" "autoconf" "Running autoconf"
@@ -409,19 +426,18 @@ RubyWrapper
 
       if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
           (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
-      elif [[ ! -z "rvm_ruby_configure" ]] ; then
-          $rvm_ruby_configure
+      elif [[ ! -z "$rvm_ruby_configure" ]] ; then
+        __rvm_run "configure" "$rvm_ruby_configure" || (result=$? && return $result)
       elif [[ -s ./configure ]] ; then
-          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..." || (result=$? && return $result)
-          unset configure_parameters
+          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..." || (result=$? && return $result)
       else
           $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
       fi
 
-      rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
+      rvm_ruby_make=${rvm_ruby_make:-"make"}
       __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..." || (result=$? && return $result)
 
-      rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
+      rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
       __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string" || (result=$? && return $result)
 
       $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
@@ -453,7 +469,7 @@ RubyWrapper
 }
 
 __rvm_fetch_ruby() {
-  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ -z "$rvm_head_flag" ]] && [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
     rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_string"}"
@@ -521,7 +537,7 @@ __rvm_fetch_ruby() {
 }
 
 __rvm_uninstall_ruby() {
-  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_string" ]] ; then
     for dir in $rvm_path ; do
@@ -542,7 +558,7 @@ __rvm_uninstall_ruby() {
 }
 
 __rvm_remove_ruby() {
-  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_string" ]] ; then
     for dir in $rvm_src_path $rvm_path ; do
@@ -703,9 +719,9 @@ __rvm_manage_rubies() {
     fi
   fi
 
-  (( $rvm_summary_flag )) && __rvm_summary
-  (( $rvm_yaml_flag ))    && __rvm_yaml
-  (( $rvm_json_flag ))    && __rvm_json
+  if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
+  if [[ ! -z "$rvm_yaml_flag" ]]    ; then __rvm_yaml    ; fi
+  if [[ ! -z "$rvm_json_flag" ]]    ; then __rvm_json    ; fi
 }
 
 rvm_action="$1" ; rubies_string="$2"

data/scripts/notes

@@ -19,14 +19,20 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "\n       $ aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "\n    $item For MRI & ree (if you wish to use it) you will need:"
     echo -e "\n       $ aptitude install curl bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev"
+    echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
+    echo -e "\n       $ aptitude install curl mono-2.0-devel"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
     echo -e "\n       $ emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+    echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
+    echo -e "\n       $ emerge dev-lang/mono"
 
   elif [[ ! -z "$rvm_pacman_binary" ]] ; then
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
-    echo -e "       $ pacman -Sy jdk jre curl"
+    echo -e "\n       $ pacman -Sy jdk jre curl"
+    echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
+    echo -e "\n       $ pacman -Sy mono"
 
   elif [[ ! -z "$rvm_yum_binary" ]] ; then
     echo -e "    $item For ree (if you wish to use it) you will need:"
@@ -35,11 +41,15 @@ if [[ "Linux" = "$system" ]] ; then
   else
     echo -e "    $item For JRuby (if you wish to use it) you will need:"
     echo -e "\n      The SUN java runtime environment and development kit."
+    echo -e "\n    $item For IronRuby (if you wish to use it) you will need:"
+    echo -e "\n      The Mono Runtime and Development Platform (version 2.6 or greater is recommended)."
   fi
 elif [[ "Darwin" = "$system"  ]] ; then
   echo -e "    $item For Snow Leopard be sure to have XCode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version)."
   echo -e "\n    $item You should download the latest XCode tools from developer.apple.com. This will be necessary with the dvd install for Snow Leopard which has bugs."
   echo -e "\n    $item If you intend on installing MacRuby you must install LLVM first."
+  echo -e "\n    $item If you intend on installing JRuby you must install Java. The JDK is recommended."
+  echo -e "\n    $item If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended)."
 fi
 
 echo

data/scripts/rvm

@@ -23,8 +23,8 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   fi
   if [[ -d "$rvm_path" ]] ; then
     source $rvm_path/scripts/array
-    source $rvm_path/scripts/initialize
     source $rvm_path/scripts/utility
+    source $rvm_path/scripts/initialize
     source $rvm_path/scripts/selector
     source $rvm_path/scripts/cli
     #source $rvm_path/scripts/gems

data/scripts/rvm-install

@@ -3,7 +3,7 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
+if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
@@ -12,6 +12,7 @@ if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   fi
 fi
 
+source scripts/utility
 source scripts/initialize
 
 #
@@ -54,7 +55,7 @@ fi
 echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
-for file in rvm-prompt rvm ; do
+for file in rvm-prompt rvm rvmsudo ; do
   cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
@@ -68,7 +69,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] ; then
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
     if [[ -s "$HOME/.profile" ]] ; then
       if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
         echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
       fi
     fi
@@ -81,6 +82,7 @@ fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
   chmod +x $rvm_symlink_path/rvm
 fi

data/scripts/selector

@@ -42,16 +42,23 @@ __rvm_select() {
     rbx|rubinius)
       rvm_ruby_interpreter="rbx"
       rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
-      rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
       __rvm_db "rbx_url" "rvm_url"
-
-      rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
+      if [[ -z "$rvm_head_flag" ]] ; then
+        rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
+        rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version-p$rvm_ruby_patch_level"
+        rvm_ruby_string="${rvm_ruby_string/-prc/-rc}"
+        rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
+        rvm_ruby_file="rubinius-$rvm_ruby_version-$rvm_ruby_patch_level"
+      else
+        unset rvm_ruby_patch_level
+        rvm_ruby_string="$rvm_ruby_interpreter-$rvm_ruby_version-head"
+      fi
     ;;
 
     jruby)
       unset rvm_ruby_patch_level
-      if [[ "$rvm_head_flag" -eq 1 ]] ; then
+      if [[ ! -z "$rvm_head_flag" ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_string="jruby-head"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
@@ -69,11 +76,19 @@ __rvm_select() {
 
     ironruby)
       unset rvm_ruby_patch_level
-      rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
-      rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-      rvm_ruby_package_file="${rvm_ruby_string}.zip"
-      rvm_ruby_package_name="${rvm_ruby_string}"
-      rvm_url="$(__rvm_db "ironruby_url")${rvm_ruby_package_file}"
+      if [[ "$rvm_head_flag" -eq 1 ]] ; then
+        rvm_ruby_version="head"
+        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        rvm_ruby_package_name="${rvm_ruby_string}"
+        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+      else
+        rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
+        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+        rvm_ruby_package_file="${rvm_ruby_string}.zip"
+        rvm_ruby_package_name="${rvm_ruby_string}"
+        rvm_url="$(__rvm_db "ironruby_url")${rvm_ruby_package_file}"
+      fi
     ;;
 
     ree)
@@ -154,10 +169,10 @@ __rvm_select() {
     rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
     rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
     rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"
-    if [[ -z "$rvm_gem_set_name" ]] ; then
-      rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_interpreter}/${rvm_ruby_version}"
-    else
-      rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_interpreter}/${rvm_ruby_version}%${rvm_gem_set_name}"
+    rvm_ruby_gem_home="${rvm_gem_path}/${rvm_ruby_string}"
+
+    if [[ ! -z "$rvm_gem_set_name" ]] ; then
+      rvm_ruby_gem_home="${rvm_ruby_gem_home}%${rvm_gem_set_name}"
     fi
 
     rvm_ruby_selected_flag=1
@@ -231,7 +246,7 @@ __rvm_use() {
     if [[ ! -d $MY_RUBY_HOME ]] ; then
       $rvm_scripts_path/log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
       if [[ ! -z "$rvm_install_on_use_flag" ]] ; then
-        __rvm_install_ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
+        $rvm_scripts_path/manage "install" "$rvm_ruby_string"
       else
         $rvm_scripts_path/log "info" "To install do: 'rvm install $rvm_ruby_string'"
         return 1
@@ -277,9 +292,8 @@ __rvm_use() {
         if [[ ! -z "$rvm_default_flag" ]] ; then $rvm_scripts_path/symlink "default" ; fi
       fi
     fi
-
-    unset rvm_default_flag
   fi
+  unset rvm_default_flag
 
   if [[ ! -z "$rvm_symlink_name" ]] ; then $rvm_scripts_path/symlink "$rvm_symlink_name" ; unset rvm_symlink_name ; fi
   if [[ ! -z "$rvm_editor_flag" ]] ; then $rvm_scripts_path/symlink "editor" ; unset rvm_editor_flag ; fi
@@ -329,6 +343,8 @@ __rvm_ruby_string() {
       break
     elif $rvm_scripts_path/match "$string" "^preview" ; then
       rvm_ruby_patch_level="$string"
+    elif $rvm_scripts_path/match "$string" "^rc[0-9]" ; then
+      rvm_ruby_patch_level="$string"
     elif $rvm_scripts_path/match "$string" "^[0-9]\.[0-9]" ; then
       if [[ "1.8" = "$string" ]] ; then string="1.8.6" ; fi
       if [[ "1.9" = "$string" ]] ; then string="1.9.1" ; fi
@@ -360,7 +376,7 @@ __rvm_ruby_string() {
     elif $rvm_scripts_path/match "$string" "^u[a-z0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag rvm_ruby_patch
       rvm_ruby_user_tag="$string"
-    elif [[ "$string" = "ruby" ]] || [[ "$string" = "jruby" ]] || [[ "$string" = "ree" ]] || [[ "$string" = "macruby" ]] || [[ "$string" = "rbx" ]] || [[ "$string" = "rubinius" ]] || [[ "$string" = "mput" ]] || [[ "$string" = "shyouhei" ]] || [[ "$string" = "ironruby" ]] ; then
+    elif $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius mput shyouhei ironruby" "$string" ; then
       rvm_ruby_interpreter="$string"
     else
       $rvm_scripts_path/log "error" "Unknown ruby string component: '$string'"
@@ -411,6 +427,7 @@ __rvm_ruby_string() {
     if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
       rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
+      rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
     fi
   fi
 }

data/scripts/update

@@ -3,7 +3,7 @@
 if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
 if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 
-if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
+if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
@@ -12,6 +12,7 @@ if [[ ! -d "$rvm_path" ]] || [[ "$rvm_path" = "/" ]] ; then
   fi
 fi
 
+source scripts/utility
 source scripts/initialize
 
 #
@@ -54,7 +55,7 @@ fi
 echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
 # Cleanse and purge...
 rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
-for file in rvm-prompt rvm ; do
+for file in rvm-prompt rvm rvmsudo ; do
   cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
 done
 chmod +x $rvm_path/bin/*
@@ -68,7 +69,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] ; then
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
     if [[ -s "$HOME/.profile" ]] ; then
       if ! grep -q '.profile' "$rcfile" ; then
-        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
         echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
       fi
     fi
@@ -81,6 +82,7 @@ fi
 
 if [[ "root" = "$(whoami)" ]] ; then
   echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  mkdir -p $rvm_symlink_path
   ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
   chmod +x $rvm_symlink_path/rvm
 fi

data/scripts/utility

@@ -157,7 +157,7 @@ __rvm_bin_scripts() {
 }
 
 __rvm_bin_script() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
@@ -260,7 +260,7 @@ __rvm_implode() {
 }
 
 __rvm_source_dir() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
   if [[ -z "$rvm_ruby_src_path" ]] ; then
     $rvm_scripts_path/log "fail" "No source directory exists for the default implementation."
   else
@@ -281,7 +281,7 @@ __rvm_list() {
     echo -e "rbx(-head) # rubinius head, the default rbx \nrbx(-head) --jit (rubinius head with LLVM enabled)"
     echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
     echo -e "mput(-head) # shyouhei head, the default mput"
-    echo -e "ironruby-0.9.3 # (1.0 RC1)"
+    echo -e "ironruby-0.9.3 # (1.0 RC1)\nironruby-head"
     if [[ "Darwin" = "$(uname)" ]] ; then
       echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
     fi
@@ -681,10 +681,10 @@ __rvm_gems_select() {
     fi
 
     if [[ ! -z "$rvm_gem_set_name" ]] && ! $rvm_scripts_path/match "$rvm_gem_set_name" "^[0-9]\.[0-9]" ; then
-      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
+      rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
     else
       if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
-        rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
+        rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string"
       elif [[ -z "$GEM_HOME" ]]  && [[ ! -z "$(which gem 2>/dev/null)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
       elif [[ ! -z "$GEM_HOME" ]] ; then
@@ -695,12 +695,12 @@ __rvm_gems_select() {
     fi
     if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
   else
-    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
+    rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_string%$rvm_gem_set_name"
   fi
 }
 
 __rvm_gems_use() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     mkdir -p "$rvm_ruby_gem_home"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.97
+  version: 0.0.98
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -05:00
+date: 2009-12-21 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -26,6 +26,7 @@ files:
 - README
 - binscripts/rvm
 - binscripts/rvm-prompt
+- binscripts/rvmsudo
 - config/db
 - config/md5
 - examples/rvmrc