rvm 0.0.86 → 0.0.87

data/binscripts/rvm

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
+
+if [[ -z "$rvm_path" ]] ; then
+  if [[ "root" = "$(whoami)" ]] ; then
+    rvm_path="${rvm_path:-/usr/local/rvm}"
+  else
+    rvm_path="${rvm_path:-$HOME/.rvm}"
+  fi
+fi
+
+source $rvm_path/scripts/rvm
+rvm "$*"

data/install

@@ -26,7 +26,7 @@ source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing to $rvm_path..."
+echo -e "\n    Prepairing $rvm_path ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -35,6 +35,7 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
+echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # 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"
@@ -46,47 +47,49 @@ done ; unset dir_name
 #
 # Bin Scripts
 #
-cp -Rf "$source_dir/binscripts/" $rvm_path/bin
+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
+  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+done
 chmod +x $rvm_path/bin/*
-ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 
 #
 # RC Files
 #
+echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -z "$(awk "/scripts\/rvm/" $rcfile)" ]] ; then
+
+    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
+    if [[ $? -gt 0 ]] ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
       echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    else
-      : # it exists... remove it and append at the end
     fi
   done
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
-  ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
-else
-  ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
+  echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvm
 fi
-chmod +x $rvm_path/scripts/rvm
 
 #
 # System Checks
 #
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
+echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
 echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-if [[ -x "$rvm_path/scripts/rvm" ]] ; then
-  "$rvm_path/scripts/rvm" -v
-fi
+if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 
 exit 0

data/lib/VERSION.yml

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

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.86"
+  s.version = "0.0.87"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-11-30}
+  s.date = %q{2009-12-02}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     "LICENCE",
      "README",
+     "binscripts/rvm",
      "binscripts/rvm-prompt",
      "config/db",
      "config/md5",
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
      "rvm.gemspec",
      "scripts/aliases",
      "scripts/array",
+     "scripts/cd",
      "scripts/cli",
      "scripts/color",
      "scripts/completion",
@@ -75,4 +77,3 @@ Gem::Specification.new do |s|
   else
   end
 end
-

data/scripts/cd

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Source a .rvmrc file in a directory after changing to it, if it exists.
+cd() {
+  builtin cd "$@"
+  if [[ "$rvm_project_rvmrc" != 0 ]] ; then
+    local cwd ; cwd=$(pwd)
+    while : ; do
+      if [[ -f "$cwd/.rvmrc" ]] ; then source "$cwd/.rvmrc" ; break ; fi
+      cwd=$(dirname $cwd)
+      if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
+        if [[ "$rvm_project_rvmrc_default" != 0 ]] ; then
+          rvm default 1>/dev/null 2>&1
+        fi
+        break
+      fi
+    done
+  fi
+}
+

data/scripts/cli

@@ -17,7 +17,7 @@ __rvm_parse_args() {
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
+      fetch|install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|update|iconv|curl|openssl|ncurses|zlib|readline|monitor|notes)
         rvm_action=$rvm_token
       ;;
 
@@ -151,6 +151,19 @@ __rvm_parse_args() {
         shift
       ;;
 
+      # For use with --patch
+      --patch-name) rvm_ruby_patch_name="$1" ; shift ;;
+
+      -h|--patch)
+        if [[ -z "$rvm_ruby_patch" ]] ; then
+          rvm_ruby_patch="$1";
+        else
+          rvm_ruby_patch="$rvm_ruby_patch,$1";
+        fi
+        rvm_action="${rvm_action:-use}"
+        shift
+      ;;
+
       --head)
         if [[ -z "$rvm_ruby_string" ]] ; then rvm_ruby_string="head"; else rvm_ruby_string="${rvm_ruby_string}-head" ; fi
         rvm_ruby_revision="head"
@@ -316,6 +329,8 @@ __rvm_parse_args() {
     if [[ ! -z "$rvm_parse_break" ]] || [[ ! -z "$rvm_error_message" ]] ; then unset rvm_parse_break; break; fi
   done
 
+  while [[ $# -gt 0 ]] ; do shift ; done
+
   if [[ ! -z "$rvm_error_message" ]] ; then __rvm_pushpop ; return 1 ; fi
 }
 
@@ -358,8 +373,8 @@ rvm() {
       $rvm_scripts_path/monitor ; result=$?
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload) rvm_reload_flag=1 ; break   ;;
-    install|uninstall) __rvm_manage_rubies   ; result=$? ;;
+    reload) rvm_reload_flag=1                             ;;
+    fetch|install|uninstall) __rvm_manage_rubies   ; result=$? ;;
     tests|specs)   rvm_action="rake" ; __rvm_do ; result=$? ;;
 
     iconv|openssl|ncurses|zlib|readline|curl)
@@ -388,7 +403,6 @@ rvm() {
       result=1
   esac
 
-
   if [[ "$rvm_reload_flag" -eq 1 ]] ; then source "$rvm_path/scripts/rvm" ; fi
 
   if [[ "1" = "$rvm_trace_flag" ]] ; then set +x ; unset rvm_trace_flag ; fi
@@ -396,4 +410,3 @@ rvm() {
   return $result
 }
 
-

data/scripts/gems

@@ -176,7 +176,7 @@ __rvm_gems_load() {
       #
       if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_file_name}spec" ]] ; then
         unset gem
-        $rvm_scripts_path/log "warn" "$($rvm_scripts_path/color "yellow")$gem_name $gem_version$($rvm_scripts_path/color "none") exists, skipping (--force to re-install)"
+        $rvm_scripts_path/log "info" "$($rvm_scripts_path/color "green")$gem_name $gem_version$($rvm_scripts_path/color "none") exists, skipping (--force to re-install)"
       else
         if [[ -f "$gem" ]] ; then
           cache_file="$gem"
@@ -218,7 +218,7 @@ __rvm_gems_load() {
       if [[ ! -z "$gem" ]] ; then
         # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
         __rvm_make_flags
-        $rvm_scripts_path/log "info" "Installing $gem_name $gem_version..."
+        $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"
         else

data/scripts/initialize

@@ -6,6 +6,8 @@ else
   rvm_rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc"
 fi
 
+rvm_project_rvmrc="${rvm_project_rvmrc:-1}"
+rvm_project_rvmrc_default="${rvm_project_rvmrc_default:-1}"
 rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
@@ -15,6 +17,7 @@ rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
 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}"
 
 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
 

data/scripts/install

@@ -26,7 +26,7 @@ source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing to $rvm_path..."
+echo -e "\n    Prepairing $rvm_path ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -35,6 +35,7 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
+echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # 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"
@@ -46,47 +47,49 @@ done ; unset dir_name
 #
 # Bin Scripts
 #
-cp -Rf "$source_dir/binscripts/" $rvm_path/bin
+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
+  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+done
 chmod +x $rvm_path/bin/*
-ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 
 #
 # RC Files
 #
+echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -z "$(awk "/scripts\/rvm/" $rcfile)" ]] ; then
+
+    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
+    if [[ $? -gt 0 ]] ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
       echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    else
-      : # it exists... remove it and append at the end
     fi
   done
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
-  ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
-else
-  ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
+  echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvm
 fi
-chmod +x $rvm_path/scripts/rvm
 
 #
 # System Checks
 #
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
+echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
 echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-if [[ -x "$rvm_path/scripts/rvm" ]] ; then
-  "$rvm_path/scripts/rvm" -v
-fi
+if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 
 exit 0

data/scripts/monitor

@@ -46,9 +46,12 @@ while : ; do
 
     if [[ -d "$framework/" ]] ; then
 
-      files=($(\ls ${framework}/**/*_${framework}.rb) $(ls ${framework}/*_${framework}.rb))
-      for file in "${files[@]}" ; do
-        push_if_timestamp_changed $file $framework
+      #files=($(\ls ${framework}/**/*_${framework}.rb) $(ls ${framework}/*_${framework}.rb))
+      #for file in "${files[@]}" ; do
+      for file in ${framework}/**/*_${framework}.rb ${framework}/*_${framework}.rb ; do
+        if [[ -f "$file" ]] ; then
+          push_if_timestamp_changed $file $framework
+        fi
       done
 
       if [[ "$(array_length "changed_${framework}_files")" -gt 0 ]] ; then

data/scripts/ruby-installer

@@ -4,74 +4,15 @@ __rvm_install_source() {
   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"
-
-  if [[ ! -z "$rvm_force_flag" ]] ; then
-    rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path"
-  fi
+  if [[ ! -z "$rvm_force_flag" ]] ; then rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
 
   result=0
-  # TODO: This really should be about the url instead of this hokey logic.
-  if [[ -z "$rvm_head_flag" ]] && [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
-    if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_name.tar.gz" ]] ; then
-      rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
-      $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
-      $rvm_scripts_path/fetch "$rvm_url"
-      result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-    fi
-    #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_src_path" "Extracting $rvm_ruby_package_name ..."
-    if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-  else
-    if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
-      if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
-        builtin cd $rvm_ruby_src_path
-        if [[ -z "$rvm_ruby_revision" ]] ; then
-          $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-          git pull origin master
-          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-        else
-          if [[ -z "$rvm_ruby_sha" ]] ; then
-            git checkout HEAD
-          else
-            git checkout $(echo $rvm_ruby_sha | sed 's#^s##')
-          fi
-          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-        fi
-      else
-        $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
-        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-      fi
-    else
-      if [[ ! -z "$rvm_head_flag" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
-        rvm_url="$rvm_ruby_repo_url/trunk"
-        rvm_rev=""
-      elif [[ ! -z "$rvm_ruby_tag" ]] ; then
-        # TODO: Check if tag v is valid
-        rvm_url="$rvm_ruby_repo_url/tags/$(echo $rvm_ruby_tag | sed 's/^t//')"
-        rvm_rev=""
-      else
-        rvm_url=$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}
-        rvm_rev="-$rvm_ruby_revision"
-      fi
+  __rvm_fetch_ruby
+  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-      if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
-        builtin cd $rvm_ruby_src_path
-        $rvm_scripts_path/log "info" "Updating ruby from $rvm_url"
-        __rvm_run "svn.update" "svn update"
-        if [[ ! -z "$rvm_rev" ]] ; then
-          $rvm_scripts_path/log "info" "Checking out revision ${rvm_rev/-r/-r } from $rvm_url"
-          __rvm_run "svn.checkout" "svn update -q ${rvm_rev/-r/-r }"
-        fi
-      else
-        rm -rf $rvm_ruby_src_path
-        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path"
-      fi
-      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-    fi
-  fi
+  __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
   builtin cd $rvm_ruby_src_path
   if [[ $? -gt 0 ]] ; then result=$? ; $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
@@ -89,22 +30,28 @@ __rvm_install_source() {
     __rvm_run "configure" "$rvm_ruby_configure"
     if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
   elif [[ -s ./configure ]] ; then
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_package_name, this may take a while depending on your cpu(s)..."
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
     if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     unset configure_parameters
   else
     $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
 
+  if [[ ! -z "$rvm_ruby_patch" ]] ; then
+    for patch in $(echo $rvm_ruby_patch | tr ',' ' ') ; do
+      patch -p1 $patch
+    done
+  fi
+
   rvm_ruby_make=${rvm_ruby_make:-"make"}
-  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
   if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
   rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
-  __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_package_name"
+  __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
   if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-  $rvm_scripts_path/log "info" "Installation of $rvm_ruby_package_name is complete."
+  $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
   GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
   GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
@@ -160,7 +107,7 @@ PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 exec $macruby_path/mac$binary_name $prefix "\$@"
 RubyWrapper
 )
-          files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_package_name"
+          files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_string"
           for file_name in $(echo $files)  ; do
             rm -f $file_name
             echo "$ruby_wrapper" > $file_name
@@ -215,7 +162,7 @@ RubyWrapper
         __rvm_inject_gem_env "$rvm_ruby_gem_home/bin/rake"
 
         __rvm_irbrc
-        __rvm_bin_scripts
+        __rvm_bin_script
         __rvm_post_install
         __rvm_pushpop
       else
@@ -237,14 +184,14 @@ RubyWrapper
       echo "$(export rvm_install_on_use_flag=1 ; rvm 1.8.7)" # 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="rbx-head" ; __rvm_select
 
       unset GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC
       PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
-        if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_name.tar.gz" ]] ; then
+        if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_file.tar.gz" ]] ; then
           $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=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
@@ -253,7 +200,7 @@ RubyWrapper
         if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
         mv $rvm_src_path/rubinius-$rvm_ruby_version $rvm_ruby_src_path
       else
-        rvm_ruby_repo_url="$rvm_rubinius_repo_url"
+        __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
         #rvm_ruby_home="$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version"
         if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
           rm -rf "$rvm_ruby_src_path" ; builtin cd "$rvm_home"
@@ -315,7 +262,7 @@ PATH="$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH" ; export PATH
 exec $rvm_ruby_home/bin/rbx $prefix $binary_name "\$@"
 RubyWrapper
 )
-        files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_package_name"
+        files="$rvm_ruby_home/bin/$binary_name $rvm_path/bin/$binary_name-$rvm_ruby_string"
         for file_name in $(echo $files)  ; do
           rm -f $file_name
           echo "$ruby_wrapper" > $file_name
@@ -337,51 +284,21 @@ RubyWrapper
       fi ; unset binary
 
       __rvm_irbrc
-      __rvm_bin_scripts
+      __rvm_bin_script
     ;;
 
     jruby)
       mkdir -p "$rvm_ruby_log_path"  "$rvm_ruby_src_path"
       __rvm_pushpop $rvm_src_path
 
-      if [[ "$rvm_head_flag" -eq 1 ]] || [[ ! -z "$rvm_ruby_revision" ]] ; then
-        if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
-          builtin cd "$rvm_ruby_src_path"
-          if [[ -z "$rvm_ruby_revision" ]] ; then
-            $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-            git pull origin master
-            if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-          else
-            if [[ -z "$rvm_ruby_sha" ]] ; then
-              git checkout HEAD
-            else
-              git checkout $(echo $rvm_ruby_sha | sed 's#^s##')
-            fi
-            if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-          fi
-        else
-          rm -rf "$rvm_ruby_src_path"
-          $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-          git clone --depth 1 "$rvm_ruby_repo_url" "$rvm_ruby_src_path"
-          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-        fi
+      __rvm_fetch_ruby
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-        builtin cd "$rvm_ruby_src_path"
-        ant dist
-      else
-        if [[ -z "$rvm_force_flag" ]] && [[ -f $rvm_package_file ]] && [[ -s $rvm_package_file ]] ; then
-          $rvm_scripts_path/log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
-        else
-          $rvm_scripts_path/log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
-          $rvm_scripts_path/fetch "$rvm_url"
-          result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
-        fi
-        __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_package_file..."
-        if [[ "$rvm_package_file" != "$rvm_ruby_string" ]] ; then
-          mv "$rvm_src_path/$rvm_package_file" "$rvm_src_path/$rvm_ruby_string"
-        fi
-        builtin cd "$rvm_ruby_src_path"
-      fi
+      __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+
+      builtin cd "$rvm_ruby_src_path"
+      if [[ "$rvm_head_flag" -eq 1 ]] || [[ ! -z "$rvm_ruby_revision" ]] ; then ant dist ; fi
 
       mkdir -p "$rvm_ruby_home/bin/"
       builtin cd "$rvm_ruby_src_path/tool/nailgun" && /usr/bin/make $rvm_make_flags
@@ -398,13 +315,16 @@ RubyWrapper
       done ; unset binary
       __rvm_pushpop
 
-      for binary in rake rdoc ri spec autospec \
-                     testrb jrubyc jirb_swing jirb jgem ast generate_yaml_index.rb; do
+      for binary in rake rdoc ri spec autospec testrb ast generate_yaml_index.rb ; do
         __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
         __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
         chmod +x $rvm_ruby_home/bin/$binary
       done ; unset binary
 
+      for binary in jrubyc jirb_swing jirb jgem ; do
+        __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
+      done
+
       __rvm_rubygems_setup
       __rvm_irbrc
       __rvm_bin_script
@@ -449,7 +369,7 @@ RubyWrapper
       elif [[ ! -z "rvm_ruby_configure" ]] ; then
           $rvm_ruby_configure
       elif [[ -s ./configure ]] ; then
-          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..."
+          __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)..."
           if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
           unset configure_parameters
       else
@@ -457,14 +377,14 @@ RubyWrapper
       fi
 
       rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
-      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
+      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
       if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
       rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
-      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_package_name"
+      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
       if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
-      $rvm_scripts_path/log "info" "Installation of $rvm_ruby_package_name is complete."
+      $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
       GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME
       GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH
@@ -531,24 +451,95 @@ __rvm_manage_rubies() {
   if [[ ! -z "$rvm_json_flag" ]]   ; then __rvm_json    ; fi
 }
 
+__rvm_fetch_ruby() {
+  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"}"
+    rvm_ruby_package_file="${rvm_ruby_package_file:-"$rvm_ruby_package_name"}"
+    if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.tar.gz" ]] ; then
+      if [[ "ruby" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_url="ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_file.tar.gz"
+      elif [[ "ree" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
+      elif [[ "jruby" = "$rvm_ruby_interpreter" ]] ; then
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_version/$rvm_ruby_package_file.tar.gz"
+      else
+        rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_package_file.tar.gz"
+      fi
+      $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
+      $rvm_scripts_path/fetch "$rvm_url"
+      result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+    fi
+  else
+    if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
+      if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
+        builtin cd $rvm_ruby_src_path
+        if [[ -z "$rvm_ruby_revision" ]] ; then
+          $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
+          git pull origin master
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+        else
+          if [[ -z "$rvm_ruby_sha" ]] ; then
+            git checkout HEAD
+          else
+            git checkout $(echo $rvm_ruby_sha | sed 's#^s##')
+          fi
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+        fi
+      else
+        $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
+        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
+        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+      fi
+    else
+      if [[ ! -z "$rvm_head_flag" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
+        rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
+        rvm_rev=""
+      elif [[ ! -z "$rvm_ruby_tag" ]] ; then
+        # TODO: Check if tag v is valid
+        rvm_url="${rvm_url:-"$rvm_ruby_repo_url/tags/$(echo $rvm_ruby_tag | sed 's/^t//')"}"
+        rvm_rev=""
+      else
+        rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}"
+        rvm_rev="-$rvm_ruby_revision"
+      fi
+
+      if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
+        builtin cd $rvm_ruby_src_path
+        $rvm_scripts_path/log "info" "Updating ruby from $rvm_url"
+        __rvm_run "svn.update" "svn update"
+        if [[ ! -z "$rvm_rev" ]] ; then
+          $rvm_scripts_path/log "info" "Checking out revision ${rvm_rev/-r/-r } from $rvm_url"
+          __rvm_run "svn.checkout" "svn update -q ${rvm_rev/-r/-r }"
+        fi
+      else
+        rm -rf $rvm_ruby_src_path
+        __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path"
+      fi
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+    fi
+  fi
+}
+
 __rvm_uninstall_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
-  if [[ ! -z "$rvm_ruby_package_name" ]] ; then
+  if [[ ! -z "$rvm_ruby_string" ]] ; then
     for dir in $rvm_path ; do
-      if [[ -d $dir/$rvm_ruby_package_name ]] ; then
-        $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_package_name..."
-        rm -rf $dir/$rvm_ruby_package_name
+      if [[ -d $dir/$rvm_ruby_string ]] ; then
+        $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
+        rm -rf $dir/$rvm_ruby_string
       else
-        $rvm_scripts_path/log "info" "$dir/$rvm_ruby_package_name has already been removed."
+        $rvm_scripts_path/log "info" "$dir/$rvm_ruby_string has already been removed."
       fi
-      if [[ -e $rvm_bin_path/$rvm_ruby_package_name ]] ; then
-        rm -f $rvm_bin_path/$rvm_ruby_package_name
+      if [[ -e $rvm_bin_path/$rvm_ruby_string ]] ; then
+        rm -f $rvm_bin_path/$rvm_ruby_string
       fi
     done ; unset dir
     rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
   else
-    $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
+    $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
   fi
 }
 
@@ -559,7 +550,7 @@ __rvm_remove_ruby() {
     for dir in $rvm_src_path $rvm_path ; do
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
-        rm -rf $dir/$rvm_ruby_package_name
+        rm -rf $dir/$rvm_ruby_string
       else
         $rvm_scripts_path/log "info" "it seems that $dir/$rvm_ruby_string is already non existent."
       fi
@@ -568,7 +559,7 @@ __rvm_remove_ruby() {
       fi
     done ; unset dir
   else
-    $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_package_name'"
+    $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
   fi
 }
 
@@ -587,13 +578,13 @@ __rvm_post_install() {
     fi
   done ; unset binary binaries
 
-  $rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_package_name."
+  $rvm_scripts_path/log "info" "Installing gems for $rvm_ruby_string."
 
   for rvm_gem_name in rake ; do
     __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install $rvm_gem_name --no-rdoc --no-ri -q" "Installing $rvm_gem_name"
   done ; unset rvm_gem_name
 
-  $rvm_scripts_path/log "info" "Installation of gems for $rvm_ruby_package_name is complete."
+  $rvm_scripts_path/log "info" "Installation of gems for $rvm_ruby_string is complete."
 
   binary=rake
   if [[ -x $rvm_ruby_gem_home/bin/$binary ]] ; then
@@ -618,7 +609,7 @@ __rvm_rubygems_setup() {
   elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
     (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version"
   else
-    $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
+    $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
     rvm_gem_package_name="rubygems-1.3.5"
     rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
 

data/scripts/rvm

@@ -5,6 +5,8 @@
 # http://gitub.com/wayneeseguin/rvm
 
 if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
+  unset rvm_reload_flag
+
   if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
   if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
   if [[ -z "$rvm_path" ]] ; then unset rvm_path ; fi
@@ -27,19 +29,14 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   source $rvm_path/scripts/cli
   source $rvm_path/scripts/gems
   source $rvm_path/scripts/libraries
+  source $rvm_path/scripts/cd
 
-  unset rvm_reload_flag ; rvm_loaded_flag=1
+  rvm_loaded_flag=1
 
   rvm_version="$(cat "${rvm_path}/lib/VERSION.yml" | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')" ; export rvm_version
 
-  if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
-
-  # Source a .rvmrc file in a directory after changing to it, if it exists.
-  cd() { builtin cd "$@" ; if [[ -f .rvmrc ]] ; then source .rvmrc ; fi ; }
-
   alias rvm-restart="source '${rvm_path}/scripts/rvm'"
-fi
 
-# Ok now we determine if we were called or sourced... under assumption of course ;)
-if [[ $# -gt 0 ]] && [[ -z "$(echo "$*" | awk '/completion-/')" ]] ; then rvm "$*" ; fi
+  if [[ -f "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
+fi
 

data/scripts/rvm-install

@@ -26,7 +26,7 @@ source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing to $rvm_path..."
+echo -e "\n    Prepairing $rvm_path ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -35,6 +35,7 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
+echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # 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"
@@ -46,47 +47,49 @@ done ; unset dir_name
 #
 # Bin Scripts
 #
-cp -Rf "$source_dir/binscripts/" $rvm_path/bin
+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
+  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+done
 chmod +x $rvm_path/bin/*
-ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 
 #
 # RC Files
 #
+echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -z "$(awk "/scripts\/rvm/" $rcfile)" ]] ; then
+
+    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
+    if [[ $? -gt 0 ]] ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
       echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    else
-      : # it exists... remove it and append at the end
     fi
   done
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
-  ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
-else
-  ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
+  echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvm
 fi
-chmod +x $rvm_path/scripts/rvm
 
 #
 # System Checks
 #
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
+echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
 echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-if [[ -x "$rvm_path/scripts/rvm" ]] ; then
-  "$rvm_path/scripts/rvm" -v
-fi
+if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 
 exit 0

data/scripts/selector

@@ -24,12 +24,13 @@ __rvm_select() {
         elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
           rvm_url="http://macruby.icoretech.org/latest"
           rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+          rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
+          rvm_ruby_package_file="$rvm_ruby_package_name"
         else
           __rvm_db "macruby_version" "rvm_ruby_version"
-          rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
-          rvm_ruby_package_file="MacRuby%200.5%20beta%201.zip"
+          rvm_ruby_package_name="MacRuby%200.5%20beta%201.zip"
+          rvm_ruby_package_file="$rvm_ruby_package_name"
           rvm_url="http://www.macruby.org/files/MacRuby%200.5%20beta%201.zip"
-          rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         fi
 
         unset rvm_ruby_patch_level
@@ -57,9 +58,10 @@ __rvm_select() {
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
       else
         rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
-        rvm_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
+        rvm_ruby_package_file="${rvm_ruby_interpreter}-bin-${rvm_ruby_version}"
+        rvm_ruby_package_name="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        rvm_url="http://jruby.kenai.com/downloads/${rvm_ruby_version}/${rvm_package_file}.tar.gz"
+        rvm_url="http://jruby.kenai.com/downloads/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
       fi
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
@@ -81,7 +83,7 @@ __rvm_select() {
           rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_revision"
         else
           rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
-          rvm_url="${rvm_url:-$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")}/$rvm_ruby_package_file.tar.gz"
+          rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
         fi
       fi
 
@@ -196,7 +198,7 @@ __rvm_use() {
 
     if [[ "root" = "$(whoami)" ]] ; then
       for binary in erb gem irb rake rdoc ri ruby testrb ; do
-        rm -f /usr/local/bin/$binary
+        rm -f $rvm_symlink_path/$binary
       done
     fi
 
@@ -239,10 +241,10 @@ __rvm_use() {
 
     if [[ "root" = "$(whoami)" ]] ; then
       for binary in erb gem irb rake rdoc ri ruby testrb ; do
-        rm -f /usr/local/bin/$binary
-        ln -nfs $rvm_ruby_home/bin/$binary /usr/local/bin/$binary
-        rm -f /usr/local/bin/passenger_ruby
-        ln -nfs $rvm_bin_path/$rvm_ruby_string /usr/local/bin/passenger_ruby
+        rm -f $rvm_symlink_path/$binary
+        ln -nfs $rvm_ruby_home/bin/$binary $rvm_symlink_path/$binary
+        rm -f $rvm_symlink_path/passenger_ruby
+        ln -nfs $rvm_bin_path/$rvm_ruby_string $rvm_symlink_path/passenger_ruby
       done
     fi
   fi
@@ -297,6 +299,7 @@ __rvm_ruby_string() {
   # * rvm_ruby_patch_level
   # * rvm_ruby_revision
   # * rvm_ruby_tag
+  # * rvm_ruby_patch
 
   set_name=$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')
   if [[ ! -z "$set_name" ]] ; then rvm_gem_set_name="$set_name" ; fi
@@ -346,6 +349,9 @@ __rvm_ruby_string() {
       rvm_ruby_tag="$string"
     elif $rvm_scripts_path/match "$string" "^m[0-9]" ; then
       rvm_ruby_mode="$string"
+    elif $rvm_scripts_path/match "$string" "^h[a-z]" ; then
+      unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag
+      rvm_ruby_patch="$string"
     elif $rvm_scripts_path/match "$string" "^[a-z][a-z]" ; then
       rvm_ruby_interpreter="$string"
     else
@@ -381,6 +387,11 @@ __rvm_ruby_string() {
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_revision}"
   elif [[ ! -z "$rvm_ruby_tag" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_tag}"
+  elif [[ ! -z "$rvm_ruby_patch" ]]  ; then
+    if [[ -z "$rvm_ruby_patch_name" ]] ; then
+      rvm_ruby_patch_name="$(basename $rvm_ruby_patch | awk -F',' '{print $1}')"
+    fi
+    rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch}"
   elif [[ ! -z "$rvm_ruby_patch_level" ]]  ; then
     rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
   else

data/scripts/update

@@ -26,7 +26,7 @@ source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing to $rvm_path..."
+echo -e "\n    Prepairing $rvm_path ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
@@ -35,6 +35,7 @@ cp -f "$source_dir/README" "$rvm_path/"
 #
 # Scripts
 #
+echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # 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"
@@ -46,47 +47,49 @@ done ; unset dir_name
 #
 # Bin Scripts
 #
-cp -Rf "$source_dir/binscripts/" $rvm_path/bin
+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
+  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+done
 chmod +x $rvm_path/bin/*
-ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 
 #
 # RC Files
 #
+echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-    if [[ -z "$(awk "/scripts\/rvm/" $rcfile)" ]] ; then
+
+    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
+    if [[ $? -gt 0 ]] ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
       echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
-    else
-      : # it exists... remove it and append at the end
     fi
   done
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
-  ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
-else
-  ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
+  echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvm
 fi
-chmod +x $rvm_path/scripts/rvm
 
 #
 # System Checks
 #
 $rvm_path/scripts/notes
 
-echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e "    $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e "    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+echo -e "    $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
+echo -e "\n       if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "\n    $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
 
 echo -e "\n$(tput setaf 2)RTFM:\n    $(tput sgr0) http://rvm.beginrescueend.com/ \n"
 echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
 echo -e "\n    ~ Wayne\n"
 
-if [[ -x "$rvm_path/scripts/rvm" ]] ; then
-  "$rvm_path/scripts/rvm" -v
-fi
+if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 
 exit 0

data/scripts/utility

@@ -17,6 +17,7 @@ __rvm_db() {
       eval "$variable=$value"
     fi
   fi
+  unset key value variable
 }
 
 __rvm_info() {
@@ -65,7 +66,7 @@ __rvm_debug() {
     $rvm_scripts_path/log "debug" "ARCHFLAGS: $ARCHFLAGS"
     $rvm_scripts_path/log "debug" "LDFLAGS: $LDFLAGS"
     $rvm_scripts_path/log "debug" "CFLAGS: $CFLAGS"
-    $rvm_scripts_path/log "debug" "/Developer/SDKs/*:$(basename -a /Developer/SDKs/* | tr "\n" ',')"
+    $rvm_scripts_path/log "debug" "/Developer/SDKs/*:$(/usr/bin/basename -a /Developer/SDKs/* | tr "\n" ',')"
   fi
 
   for file_name in $(echo $rc_files) ; do
@@ -130,11 +131,11 @@ __rvm_run() {
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_ruby_selected_flag 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
+  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_unset_ruby_variables() {
-  unset rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode
+  unset rvm_ruby_interpreter rvm_ruby_version rvm_url rvm_ruby_repo_url rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_ruby_binary rvm_ruby_home rvm_ruby_log_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string rvm_ruby_string rvm_ruby_src_path rvm_ruby_repo_url rvm_major_version rvm_minor_version rvm_ruby_gem_home rvm_head_flag rvm_ruby_configure rvm_ruby_mode rvm_ruby_patch rvm_ruby_package_file rvm_ruby_package_name
 }
 
 __rvm_load_rvmrc() {
@@ -143,12 +144,13 @@ __rvm_load_rvmrc() {
 }
 
 __rvm_bin_scripts() {
-  for rvm_ruby_binary in $(\ls $rvm_path/*/bin/ruby 2> /dev/null) ; do
-    if [[ -x "$rvm_ruby_binary" ]] ; then
-      rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
-      __rvm_select
-      __rvm_bin_script
-    fi
+  # for rvm_ruby_binary in $(\ls $rvm_path/*/bin/ruby 2> /dev/null) ; do
+  for rvm_ruby_binary in $rvm_path/*/bin/ruby ; do
+  if [[ -x "$rvm_ruby_binary" ]] ; then
+    rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
+    __rvm_select
+    __rvm_bin_script
+  fi
   done
 }
 
@@ -678,7 +680,7 @@ __rvm_make_flags() {
     if [[ ! -z "$rvm_archflags" ]] ; then
       ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
       # Use the latest sdk available.
-      if [[ -z "$rvm_sdk" ]] ; then rvm_sdk="$(basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)" ; fi
+      if [[ -z "$rvm_sdk" ]] ; then rvm_sdk="$(/usr/bin/basename -a /Developer/SDKs/* | awk '/^M/' | sort | tail -n 1)" ; fi
       CFLAGS="${CFLAGS:-"-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags"}" ; export CFLAGS
       LDFLAGS="${LDFLAGS:-"-Wl,-syslibroot /Developer/SDKs/$rvm_sdk $rvm_archflags"}" ; export LDFLAGS
       # CXXFLAGS="-mmacosx-version-min="$(sw_vers -productVersion | awk -F'.' '{print $1"."$2}')" -isysroot /Developer/SDKs/$rvm_sdk " ; export CXXFLAGS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.86
+  version: 0.0.87
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -05:00
+date: 2009-12-02 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files:
 files: 
 - LICENCE
 - README
+- binscripts/rvm
 - binscripts/rvm-prompt
 - config/db
 - config/md5
@@ -38,6 +39,7 @@ files:
 - rvm.gemspec
 - scripts/aliases
 - scripts/array
+- scripts/cd
 - scripts/cli
 - scripts/color
 - scripts/completion