rvm 0.1.0 → 0.1.1

data/README

@@ -26,6 +26,8 @@ Action
   tests     - runs 'rake test' across selected ruby versions
   specs     - runs 'rake spec' across selected ruby versions
 
+  gems      - gems(ets): http://rvm.beginrescueend.com/gemsets/#managing
+
   gemdir    - switch to gem directory for installation (new login shell)
   srcdir    - switch to src directory for the current ruby installation
 

data/binscripts/rvm

@@ -5,14 +5,20 @@ if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
 if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
 
 if [[ -z "$rvm_path" ]] ; then
+  unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
     rvm_path="/usr/local/rvm"
   else
-    rvm_path="$HOME/.rvm"
+    if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+      rvm_path="$HOME/.rvm"
+    elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      rvm_path="${rvm_path:-"/usr/local/rvm"}"
+    fi
   fi
 fi
 
-source $rvm_path/scripts/rvm
+rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
+source $rvm_scripts_path/rvm
 
 unset rvm_interactive
 

data/binscripts/rvm-prompt

@@ -44,7 +44,7 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
     architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
   fi
 
-  command="prompt=\"[$format]\""
+  command="prompt=\"$format\""
   eval "$command"
   echo "${prompt/-]/]}"
 fi

data/config/db

@@ -21,7 +21,7 @@ ruby_1.8.6_patch_level=383
 ruby_1.8.7_patch_level=248
 jruby_version=1.4.0
 jruby_repo_url=git://github.com/jruby/jruby.git
-jruby_url=http://jruby.kenai.com/downloads/
+jruby_url=http://jruby.kenai.com/downloads
 macruby_version=nightly
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest/macruby_nightly-latest.pkg

data/config/md5

@@ -19,7 +19,11 @@ ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
 ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
 rubygems-1.3.5.tgz=6e317335898e73beab15623cdd5f8cff
 MagLev-22683.Darwin-i386.tar.gz=bf58b17bc2ca62ac0ca9304e8909985c
+MagLev-22725.Darwin-i386.tar.gz=31f615a51c1bd02b002ba502d3af6b9b
+MagLev-22725.Linux-x86_64.tar.gz=b20d1ccf2071537c66d382079db947ae
+GemStone-22725.Linux-x86_64.tar.gz=41747ab3ff3207a007026a8161e286bc
 GemStone-22683.Darwin-i386.tar.gz=62ff6be1a99ae708e97d6d43eb044e5a
+GemStone-22725.Darwin-i386.tar.gz=a183fd8dc593258a0ca067283414227a
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
 curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
 jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117

data/install

@@ -18,6 +18,8 @@ usage() {
   "
 }
 
+if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
@@ -28,9 +30,6 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
@@ -56,15 +55,29 @@ source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
-for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p "$rvm_path/$dir_name"
+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"}"
+rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
+rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
+rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
+
+for path in src scripts bin log archives config gem ; do
+  eval "mkdir -p '\$rvm_${path}_path/'"
+done
+
+for file in README LICENCE ; do
+  cp -f "$source_path/$file" "$rvm_path/"
 done
-cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
 #
-rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -73,6 +86,7 @@ for dir_name in config scripts examples lib hooks ; do
 done ; unset dir_name
 
 if [[ ! -s "$rvm_config_path/user" ]] ; then
+  mkdir -p "$rvm_config_path/"
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
@@ -80,8 +94,8 @@ fi
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
+  rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 chmod +x $rvm_bin_path/*
@@ -154,10 +168,13 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
-echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+
+if [[ "root" != "$(whoami)" ]] ; then
+  echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
+  echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+  echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+  echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
+  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+fi
 
 exit 0

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-01-16}
+  s.date = %q{2010-01-19}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -68,8 +68,13 @@ __rvm_parse_args() {
           if [[ "$rvm_ruby_string" != "$rvm_gem_set_name" ]] ; then export rvm_ruby_string ; fi
           if [[ ! -z "$rvm_gem_set_name" ]] ; then export rvm_gem_set_name ; fi
         else
-          rvm_gem_set_name="$1" ; shift
-          export rvm_use_flag=1 # Default is to use the (named) gem set.
+          if [[ -z "$1" ]] ; then
+            rvm_action="error"
+            rvm_error_message="'gems' must be followed by a gems(et) action, see http://rvm.beginrescueend.com/gemsets/#managing for details."
+          else
+            rvm_gem_set_name="$1" ; shift
+            export rvm_use_flag=1 # Default is to use the (named) gem set.
+          fi
         fi
       ;;
 

data/scripts/initialize

@@ -12,11 +12,9 @@ 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"
-  elif [[ -d "/usr/local/rvm/scripts" ]] && [[ -f "/usr/local/rvm/scripts/rvm" ]] ; then
-    rvm_scripts_path="/usr/local/rvm/scripts"
-  else
+  if [[ -d "$HOME/.rvm/scripts" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
+    rvm_scripts_path="$HOME/.rvm/scripts"
+  elif [[ -d "$rvm_path/scripts" ]] && [[ -s "$rvm_path/scripts/rvm" ]]; then
     rvm_scripts_path="$rvm_path/scripts"
   fi
 fi

data/scripts/install

@@ -18,6 +18,8 @@ usage() {
   "
 }
 
+if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
@@ -28,9 +30,6 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
@@ -56,15 +55,29 @@ source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
-for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p "$rvm_path/$dir_name"
+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"}"
+rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
+rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
+rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
+
+for path in src scripts bin log archives config gem ; do
+  eval "mkdir -p '\$rvm_${path}_path/'"
+done
+
+for file in README LICENCE ; do
+  cp -f "$source_path/$file" "$rvm_path/"
 done
-cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
 #
-rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -73,6 +86,7 @@ for dir_name in config scripts examples lib hooks ; do
 done ; unset dir_name
 
 if [[ ! -s "$rvm_config_path/user" ]] ; then
+  mkdir -p "$rvm_config_path/"
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
@@ -80,8 +94,8 @@ fi
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
+  rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 chmod +x $rvm_bin_path/*
@@ -154,10 +168,13 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
-echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+
+if [[ "root" != "$(whoami)" ]] ; then
+  echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
+  echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+  echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+  echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
+  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+fi
 
 exit 0

data/scripts/maglev

@@ -61,9 +61,6 @@ fi
 machine_name="`uname -n`"
 $rvm_scripts_path/log "info" "Starting installation of $version on $machine_name"
 
-# Do a trivial sudo to test we can and get the password prompt out of the way
-sudo date
-
 # Figure out how much total memory is installed
 $rvm_scripts_path/log "info" "Setting up shared memory"
 #

data/scripts/manage

@@ -340,7 +340,7 @@ 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_pushpop $rvm_src_path
       __rvm_fetch_ruby
       result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -384,9 +384,9 @@ RubyWrapper
 
       $rvm_scripts_path/log "info" "Running MagLev prereqs checking script."
       $rvm_scripts_path/maglev
-        result=$? ; if [[ "$result" -gt 0 ]] ; then
-          $rvm_scripts_path/log "error" "Prerequisite checks have failed. Aborting the installation." ; __rvm_pushpop ; return $result
-        fi
+      result=$? ; if [[ "$result" -gt 0 ]] ; then
+        $rvm_scripts_path/log "error" "Prerequisite checks have failed. Aborting the installation." ; __rvm_pushpop ; return $result
+      fi
 
       mkdir -p "$rvm_ruby_log_path"
       __rvm_pushpop $rvm_src_path
@@ -399,6 +399,12 @@ RubyWrapper
         fi
       fi
 
+      if [[ ! -z "$rvm_head_flag" ]] ; then
+        cd $rvm_ruby_src_path
+        rvm_gemstone_package_file="GemStone-$(grep ^GEMSTONE version.txt | cut -f2 -d-).$(uname -sm | tr ' ' '-')"
+        rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
+      fi
+
       $rvm_scripts_path/log "info" "Downloading the gemstone package, this may take a while depending on your connection..."
       $rvm_scripts_path/fetch "$rvm_gemstone_url"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -407,7 +413,9 @@ RubyWrapper
 
       builtin cd "$rvm_src_path"
 
-      mv "$rvm_ruby_package_file" "$rvm_ruby_string"
+      if [[ -s "$rvm_ruby_package_file" ]] ; then
+        mv "$rvm_ruby_package_file" "$rvm_ruby_src_path"
+      fi
 
       builtin cd "$rvm_ruby_src_path"
 
@@ -436,6 +444,11 @@ RubyWrapper
       done ; unset binary
 
       builtin cd "$rvm_ruby_home"
+      if [[ ! -z "$rvm_head_flag" ]] ; then
+        git submodule update --init
+        $rvm_ruby_home/bin/maglev force-reload
+        ln -sf maglev.demo.key-$(uname -sm | tr ' ' '-') etc/maglev.demo.key
+      fi
 
       #ln -fs "$rvm_ruby_home/$(echo $rvm_gemstone_package_file | awk -F'.' '{print $1}')" "$rvm_ruby_home/gemstone"
 

data/scripts/rvm

@@ -42,10 +42,10 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
 
     if [[ -s "$HOME/.rvm/default" ]] ; then
       source "$HOME/.rvm/default"
-    elif [[ -s "$rvm_path/default" ]] ; then
-      source "$rvm_path/default"
-    elif [[ -s "/usr/local/rvm/default" ]] ; then
-      source "/usr/local/rvm/default"
+    elif [[ -s "$rvm_config_path/default" ]] ; then
+      source "$rvm_config_path/default"
+    elif [[ -s "/usr/local/rvm/config/default" ]] ; then
+      source "/usr/local/rvm/config/default"
     fi
   else
     echo -e "\$rvm_path is not set. rvm cannot load."

data/scripts/rvm-install

@@ -18,6 +18,8 @@ usage() {
   "
 }
 
+if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
@@ -28,9 +30,6 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
@@ -56,15 +55,29 @@ source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
-for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p "$rvm_path/$dir_name"
+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"}"
+rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
+rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
+rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
+
+for path in src scripts bin log archives config gem ; do
+  eval "mkdir -p '\$rvm_${path}_path/'"
+done
+
+for file in README LICENCE ; do
+  cp -f "$source_path/$file" "$rvm_path/"
 done
-cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
 #
-rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -73,6 +86,7 @@ for dir_name in config scripts examples lib hooks ; do
 done ; unset dir_name
 
 if [[ ! -s "$rvm_config_path/user" ]] ; then
+  mkdir -p "$rvm_config_path/"
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
@@ -80,8 +94,8 @@ fi
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
+  rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 chmod +x $rvm_bin_path/*
@@ -154,10 +168,13 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
-echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+
+if [[ "root" != "$(whoami)" ]] ; then
+  echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
+  echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+  echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+  echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
+  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+fi
 
 exit 0

data/scripts/selector

@@ -67,6 +67,7 @@ __rvm_select() {
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
       else
+        rvm_archive_extension="zip"
         rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
         rvm_ruby_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
@@ -79,6 +80,7 @@ __rvm_select() {
 
     maglev)
       unset rvm_ruby_patch_level
+      maglev_url="$(__rvm_db "maglev_url")"
       if [[ ! -z "$rvm_head_flag" ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_string="maglev-head"
@@ -87,21 +89,11 @@ __rvm_select() {
       else
         system="$(uname -s)"
         arch="$(uname -m)"
-        # It would be nice if we didn't have to do this if..else..
-        #if [[ "Darwin" = "$system" ]] ; then
-        #  rvm_ruby_package_file="MagLev-${rvm_ruby_version}.MacOSX"
-        #  rvm_gemstone_package_file="GemStone-${rvm_ruby_version}.MacOSX"
-        #elif [[ "SunOS" = "$system" ]] && [[ "i86pc" = "$(uname -m)" ]] ; then
-        #  rvm_ruby_package_file="MagLev-${rvm_ruby_version}.Solaris-x86"
-        #  rvm_gemstone_package_file="GemStone-${rvm_ruby_version}.Solaris-x86"
-        #else
         rvm_ruby_package_file="MagLev-${rvm_ruby_version}.${system}-${arch}"
         rvm_gemstone_package_file="GemStone-${rvm_ruby_version}.${system}-${arch}"
-        #fi
         rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "maglev_version")"}"
         rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        maglev_url="$(__rvm_db "maglev_url")"
         rvm_url="${rvm_ruby_url:-"$maglev_url/${rvm_ruby_package_file}.${rvm_archive_extension}"}"
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
         export MAGLEV_HOME="$rvm_rubies_path/$rvm_ruby_string"
@@ -231,9 +223,9 @@ __rvm_use() {
     new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
     new_path=$rvm_bin_path:$new_path
 
-    if [[ -s $rvm_path/default ]] ; then
+    if [[ -s $rvm_config_path/default ]] ; then
       unset new_path
-      source $rvm_path/default
+      source $rvm_config_path/default
       if [[ ! -z "$rvm_verbose_flag" ]] ; then
         $rvm_scripts_path/log "info" "Now using default ruby."
       fi
@@ -241,7 +233,7 @@ __rvm_use() {
       rvm_ruby_interpreter="system"
       $rvm_scripts_path/log "warn" "no default rvm specified, defaulting to pre-rvm system."
       unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
-      if [[ -s $rvm_path/system ]] ; then source $rvm_path/system ; fi
+      if [[ -s $rvm_config_path/system ]] ; then source $rvm_config_path/system ; fi
     fi
 
   elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
@@ -249,12 +241,12 @@ __rvm_use() {
     unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
     new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
     new_path=$rvm_bin_path:$new_path
-    if [[ -s $rvm_path/system ]] ; then
-      grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_path/system" > /dev/null
+    if [[ -s $rvm_config_path/system ]] ; then
+      grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
-        rm -f $rvm_path/system # 'system' should *not* point to an rvm ruby.
+        rm -f $rvm_config_path/system # 'system' should *not* point to an rvm ruby.
       else
-        source $rvm_path/system
+        source $rvm_config_path/system
       fi
     fi
 
@@ -310,21 +302,21 @@ __rvm_use() {
     fi
 
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-      rm -f $rvm_path/default
+      rm -f $rvm_config_path/default
       rm -f $rvm_bin_path/default*
     else
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
-      echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_bin_path:\$PATH\"" > $rvm_path/default
+      echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
 
       for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
         eval "export $variable"
         eval value=\$${variable}
         if [[ ! -z "$value" ]] ; then
-          echo "export ${variable}='$value'" >> $rvm_path/default
+          echo "export ${variable}='$value'" >> $rvm_config_path/default
         else
-          echo "unset ${variable}" >> $rvm_path/default
+          echo "unset ${variable}" >> $rvm_config_path/default
         fi
       done ; unset variable value
 
@@ -424,6 +416,8 @@ __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 $rvm_scripts_path/match "$string" "^b[0-9][0-9]" ; then
+      rvm_ruby_bits="$string"
     elif $rvm_scripts_path/match "ruby rbx jruby macruby ree rubinius maglev mput shyouhei ironruby" "$string" ; then
       rvm_ruby_interpreter="$string"
     else

data/scripts/update

@@ -18,6 +18,8 @@ usage() {
   "
 }
 
+if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
@@ -28,9 +30,6 @@ while [[ $# -gt 0 ]] ; do
   esac
 done
 
-if [[ -s /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
-if [[ -s "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
-
 if ! [[ "$rvm_path" =~ /rvm/?$ ]] ; then
   unset rvm_path
   if [[ "root" = "$(whoami)" ]] ; then
@@ -56,15 +55,29 @@ source_path="${source_path:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\nInstalling rvm to $rvm_path/ ..."
-for dir_name in src scripts bin log archives config gems examples ; do
-  mkdir -p "$rvm_path/$dir_name"
+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"}"
+rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
+rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
+rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
+rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
+rvm_gem_options="${rvm_gem_options:-"--no-rdoc --no-ri"}"
+
+for path in src scripts bin log archives config gem ; do
+  eval "mkdir -p '\$rvm_${path}_path/'"
+done
+
+for file in README LICENCE ; do
+  cp -f "$source_path/$file" "$rvm_path/"
 done
-cp -f "$source_path/README" "$rvm_path/"
 
 #
 # Scripts
 #
-rm -rf $rvm_scripts_path # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
@@ -73,6 +86,7 @@ for dir_name in config scripts examples lib hooks ; do
 done ; unset dir_name
 
 if [[ ! -s "$rvm_config_path/user" ]] ; then
+  mkdir -p "$rvm_config_path/"
   echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
 fi
 
@@ -80,8 +94,8 @@ fi
 # Bin Scripts
 #
 # Cleanse and purge...
-rm -f $rvm_bin_path/rvm ; rm -rf $rvm_bin_path/binscripts
 for file in rvm-prompt rvm rvmsudo ; do
+  rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 chmod +x $rvm_bin_path/*
@@ -154,10 +168,13 @@ echo -e "If I do not respond right away, please hang around after asking your qu
 echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
 echo -e "\n    ~ Wayne"
 echo -e "\n********************************************************************************"
-echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+
+if [[ "root" != "$(whoami)" ]] ; then
+  echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
+  echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
+  echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+  echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
+  echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+fi
 
 exit 0

data/scripts/utility

@@ -76,9 +76,9 @@ __rvm_debug() {
   done
 
   if [[ "root" = "$(whoami)" ]] ; then
-    debug_files="$rvm_path/default $rvm_path/system $rvm_config_path/db /etc/rvmrc /etc/gemrc"
+    debug_files="$rvm_config_path/default $rvm_config_path/system $rvm_config_path/db /etc/rvmrc /etc/gemrc"
   else
-    debug_files="$rvm_path/default $rvm_path/system $rvm_config_path/db $HOME/.rvmrc $HOME/.gemrc"
+    debug_files="$rvm_config_path/default $rvm_config_path/system $rvm_config_path/db $HOME/.rvmrc $HOME/.gemrc"
   fi
 
   for file_name in $(echo $debug_files); do
@@ -134,7 +134,10 @@ __rvm_run() {
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag
+
+  if [[ "$rvm_sticky_gems" = "1" ]] ; then export rvm_gem_set_name ; else unset rvm_gem_set_name  ; fi
+
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_load_flag rvm_dump_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits
 }
 
 __rvm_unset_ruby_variables() {
@@ -176,15 +179,15 @@ RubyWrapper
 }
 
 __rvm_load_defaults() {
-  if [[ ! -s "$rvm_path/system" ]] ; then
+  if [[ ! -s "$rvm_config_path/system" ]] ; then
     for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME ; do
       eval value=\$${variable}
       if [[ -z "$value" ]] ; then
-        echo "unset ${variable}" >> $rvm_path/system
+        echo "unset ${variable}" >> $rvm_config_path/system
       else
         eval "export $variable"
         eval value=\$${variable}
-        echo "${variable}='$value' ; export ${variable}" >> $rvm_path/system
+        echo "${variable}='$value' ; export ${variable}" >> $rvm_config_path/system
       fi
     done
   fi
@@ -307,8 +310,8 @@ __rvm_list() {
       fi
     done ; unset version
 
-    if [[ -f "$rvm_path/default" ]] && [[ -s $rvm_path/default ]] ; then
-      version=$(grep 'MY_RUBY_HOME' $rvm_path/default | awk -F"'" '{print $2}' | xargs basename)
+    if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
+      version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
         string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
         if [[ "$version" = "$current_ruby" ]] ; then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -05:00
+date: 2010-01-19 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []