rvm 0.0.71 → 0.0.72

data/config/db

@@ -5,12 +5,12 @@ shyouhei_repo_url=git://github.com/shyouhei/ruby.git
 macruby_version=nightly
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://macruby.icoretech.org/latest
-jruby_repo_url=git://kenai.com/jruby~main
+jruby_version=1.3.1
+jruby_repo_url=git://github.com/jruby/jruby.git
 ruby_configure=--enable-shared
 interpreter=ruby
 ruby_version=1.8.6
 ruby_patchlevel=383
-jruby_version=1.3.1
 ree_version=1.8.7
 ree_1.8.6_patch_level=20090610
 ree_1.8.6_url=http://rubyforge.org/frs/download.php/58677

data/install

@@ -23,8 +23,8 @@ done
 
 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 ; do
-  mkdir -p $rvm_path/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_path
+  mkdir -p "$rvm_path/$dir_name"
+  cp -Rf "$source_dir/$dir_name" "$rvm_path"
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
@@ -53,18 +53,17 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
       actual_file="$file"
     fi
 
-    grep 'rvm\/bin\/rvm' $actual_file > /dev/null
+    grep 'rvm\/bin\/rvm' "$actual_file" > /dev/null
     if [[ $? -eq 0 ]] ; then
-      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
-      rm -f $actual_file.orig
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' "$actual_file"
+      rm -f "$actual_file.orig"
     fi
 
     if [[ -f ~/.profile ]] ; then
-      grep '.profile' $actual_file > /dev/null
+      grep '.profile' "$actual_file" > /dev/null
       if [[ $? -gt 0 ]] ; then
         profile=~/.profile
-        echo -e "\n" >> $actual_file
-        echo "source $profile" >> $actual_file
+        echo -e "\nsource ${profile}" >> "$actual_file"
       fi
     fi
   fi
@@ -88,6 +87,8 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "       $ sudo aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "    $item For ree (if you wish to use it) you will need:"
     echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
+    echo -e "       $ sudo aptitude install libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/lib/VERSION.yml

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

data/lib/rvm/version.rb

@@ -1,4 +1,15 @@
 module RVM
-  require "yaml"
-  VERSION = YAML.load_file("#{File.expand_path(File.dirname(__FILE__))}/../VERSION.yml")
+  module Version
+
+    require "yaml"
+
+    YAML   = YAML.load_file("#{File.expand_path(File.dirname(__FILE__))}/../VERSION.yml")
+
+    MAJOR  = YAML[:major]
+    MINOR  = YAML[:minor]
+    PATCH  = YAML[:patch]
+
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
+
+  end
 end

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.71"
+  s.version = "0.0.72"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2009-10-31}
+  s.date = %q{2009-11-02}
   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/gems

@@ -152,7 +152,7 @@ __rvm_gems_load() {
 
   if [[ -f "$rvm_file_name" ]] ; then
     echo "Loading $rvm_file_name file..."
-    rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
+    rvm_ruby_gem_list=$(\ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
 
     while read line
     do # Keep this on 2nd line :(
@@ -188,7 +188,7 @@ __rvm_gems_load() {
         elif [[ -f "$rvm_gem_path/cache/${gem_file_name}" ]] ; then
           cache_file="$rvm_gem_path/cache/${gem_file_name}"
         else
-          cache_file="${cache_file:-$(ls ${rvm_gem_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
+          cache_file="${cache_file:-$(\ls ${rvm_gem_path}/*/*/cache/${gem_file_name}* 2> /dev/null | sort | head -n1)}"
           if [[ ! -z "$cache_file" ]] && [[ -f "$cache_file" ]] ; then
             if [[ "$(dirname $cache_file)" != "$rvm_gem_path/cache/" ]] ; then
               cp "$cache_file" "$rvm_gem_path/cache/"

data/scripts/install

@@ -23,8 +23,8 @@ done
 
 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 ; do
-  mkdir -p $rvm_path/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_path
+  mkdir -p "$rvm_path/$dir_name"
+  cp -Rf "$source_dir/$dir_name" "$rvm_path"
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
@@ -53,18 +53,17 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
       actual_file="$file"
     fi
 
-    grep 'rvm\/bin\/rvm' $actual_file > /dev/null
+    grep 'rvm\/bin\/rvm' "$actual_file" > /dev/null
     if [[ $? -eq 0 ]] ; then
-      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
-      rm -f $actual_file.orig
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' "$actual_file"
+      rm -f "$actual_file.orig"
     fi
 
     if [[ -f ~/.profile ]] ; then
-      grep '.profile' $actual_file > /dev/null
+      grep '.profile' "$actual_file" > /dev/null
       if [[ $? -gt 0 ]] ; then
         profile=~/.profile
-        echo -e "\n" >> $actual_file
-        echo "source $profile" >> $actual_file
+        echo -e "\nsource ${profile}" >> "$actual_file"
       fi
     fi
   fi
@@ -88,6 +87,8 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "       $ sudo aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "    $item For ree (if you wish to use it) you will need:"
     echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
+    echo -e "       $ sudo aptitude install libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/scripts/ruby-installer

@@ -45,18 +45,16 @@ function __rvm_install_source {
         if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
       fi
     else
-      if [[ -z "$rvm_ruby_revision" ]] ; then
+      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/$rvm_ruby_tag"
         rvm_rev=""
       else
-        if [[ "head" = "$rvm_ruby_revision" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
-          rvm_url="$rvm_ruby_repo_url/trunk"
-          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_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
@@ -87,12 +85,13 @@ function __rvm_install_source {
 
   if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
     __rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
+  elif [[ ! -z "rvm_ruby_configure" ]] ; then
+    __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 $configure_parameters" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters" "Configuring $rvm_ruby_package_name, this may take a while depending on your cpu(s)..."
     if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     unset configure_parameters
-  elif [[ ! -z "rvm_ruby_configure" ]] ; then
-    $rvm_ruby_configure
   else
     __rvm_log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
@@ -126,33 +125,23 @@ function __rvm_install_ruby {
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
-        if [[ "nightly" = "$rvm_ruby_version" ]] ; then
+        if [[ "$rvm_head_flag" = 1 ]] ; then
           macruby_path="/usr/local/bin"
-          # TODO: Separated nightly from head.
-          rvm_url="$(__rvm_db "macruby_nightly_url")"
-          __rvm_log "info" "Retrieving the latest nightly macruby build..."
-          __rvm_fetch $rvm_url
-          mv "$rvm_archives_path/latest" "$rvm_archives_path/macruby_nightly.pkg"
-          __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/macruby_nightly.pkg' -target '/'"
-          mkdir -p "$rvm_ruby_home/bin"
-        elif [[ "head" = "$rvm_ruby_version" ]] ; then
           # TODO: configure & make variables should be set here.
+          rvm_ruby_configure=""
+          rvm_ruby_make="rake"
+          rvm_ruby_make_install="sudo rake install"
           rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_repo_url")"
-          if [[ -z "$rvm_url" ]] ; then
-            __rvm_log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'"
-            result=1
-          else
-            rvm_ruby_repo_url=$rvm_url
-            __rvm_install_source $*
-          fi
-        else
+          rvm_ruby_repo_url=$rvm_url
+          __rvm_install_source $*
+        else # if [[ "nightly" = "$rvm_ruby_version" ]] ; then
           macruby_path="/usr/local/bin"
           # TODO: Separated nightly from head.
           rvm_url="$(__rvm_db "macruby_nightly_url")"
-          __rvm_log "info" "Retrieving latest macruby" # $rvm_archives_path/macruby_nightly.pkg
-          __rvm_fetch $rvm_url
-          mv $rvm_archives_path/latest $rvm_archives_path/macruby_nightly.pkg
-          __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/$rvm_ruby_package_file.zip' -target '/'"
+          __rvm_log "info" "Retrieving the latest nightly macruby build..."
+          __rvm_fetch "$rvm_url"
+          mv "$rvm_archives_path/latest" "$rvm_archives_path/macruby_nightly.pkg"
+          __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/macruby_nightly.pkg' -target '/'"
           mkdir -p "$rvm_ruby_home/bin"
         fi
 
@@ -185,7 +174,6 @@ RubyWrapper
     ;;
 
     ree)
-      __rvm_make_flags
       if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
         rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
         __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
@@ -205,7 +193,7 @@ RubyWrapper
 
         mkdir -p "$rvm_ruby_log_path"
         mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
-        if [[ ! -z "$rvm_ruby_configure" ]] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
+        if [[ ! -z "$rvm_ruby_configure" ]] ; then rvm_ruby_configure="$(echo $rvm_ruby_configure | sed 's#--#-c --#g')"; fi
         __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..." # --no-tcmalloc
         if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
         chmod +x $rvm_ruby_home/bin/*
@@ -327,14 +315,34 @@ RubyWrapper
     ;;
 
     jruby)
-      mkdir -p $rvm_ruby_log_path
+      mkdir -p "$rvm_ruby_log_path"  "$rvm_ruby_src_path"
       __rvm_pushpop $rvm_src_path
 
-      if [[ ! -z "$rvm_ruby_revision" ]] ; then
-        if [[ ! -d "$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version" ]] || [[ ! -d "$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git" ]] ; then
-          git clone --depth 1 $rvm_jruby_repo_url $rvm_ruby_src_path
-          cd $rvm_ruby_src_path && ant # TODO: Test if 'ant' is installed, if not throw error.
+      if [[ "$rvm_head_flag" -eq 1 ]] || [[ ! -z "$rvm_ruby_revision" ]] ; then
+        if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
+          cd "$rvm_ruby_src_path"
+          if [[ -z "$rvm_ruby_revision" ]] ; then
+            __rvm_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_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
+
+        cd "$rvm_ruby_src_path"
+        ant dist
+
       else
         if [[ -d $rvm_ruby_src_path ]] ; then
           cd $rvm_ruby_src_path
@@ -487,7 +495,7 @@ function __rvm_manage_rubies {
           eval "__rvm_${rvm_action}_ruby"
           __rvm_unset_ruby_variables
         fi
-      done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
+      done < <(\ls $rvm_path/*/bin/ruby 2> /dev/null)
     else
       __rvm_log "warn" 'Really? Install all? See "rvm list --all" and limit the selection to something more sane please :)'
     fi

data/scripts/rvm-install

@@ -23,8 +23,8 @@ done
 
 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 ; do
-  mkdir -p $rvm_path/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_path
+  mkdir -p "$rvm_path/$dir_name"
+  cp -Rf "$source_dir/$dir_name" "$rvm_path"
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
@@ -53,18 +53,17 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
       actual_file="$file"
     fi
 
-    grep 'rvm\/bin\/rvm' $actual_file > /dev/null
+    grep 'rvm\/bin\/rvm' "$actual_file" > /dev/null
     if [[ $? -eq 0 ]] ; then
-      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
-      rm -f $actual_file.orig
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' "$actual_file"
+      rm -f "$actual_file.orig"
     fi
 
     if [[ -f ~/.profile ]] ; then
-      grep '.profile' $actual_file > /dev/null
+      grep '.profile' "$actual_file" > /dev/null
       if [[ $? -gt 0 ]] ; then
         profile=~/.profile
-        echo -e "\n" >> $actual_file
-        echo "source $profile" >> $actual_file
+        echo -e "\nsource ${profile}" >> "$actual_file"
       fi
     fi
   fi
@@ -88,6 +87,8 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "       $ sudo aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "    $item For ree (if you wish to use it) you will need:"
     echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
+    echo -e "       $ sudo aptitude install libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/scripts/selector

@@ -14,19 +14,22 @@ function __rvm_select {
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
-        rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "macruby_repo_url")"}"
         rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
-        rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
-        if [[ "nightly" = "$rvm_ruby_version" ]] ; then
-          rvm_url="http://macruby.icoretech.org/latest"
-        elif [[ "head" = "$rvm_ruby_version" ]] ; then
+        if [[ "$rvm_head_flag" -eq 1 ]] ; then
+          unset rvm_ruby_version rvm_ruby_tag
+          rvm_ruby_revision="head"
           rvm_ruby_repo_url=${rvm_ruby_repo_url:-"$(__rvm_db "macruby_repo_url")"}
           rvm_url="$rvm_ruby_repo_url"
+          rvm_ruby_string="${rvm_ruby_interpreter}-head"
+        elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
+          rvm_url="http://macruby.icoretech.org/latest"
+          rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
         else
           rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "macruby_version")"}"
           rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
           rvm_ruby_package_file="MacRuby%200.5%20beta%201.zip"
           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
@@ -48,18 +51,23 @@ function __rvm_select {
     ;;
 
     jruby)
-      rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
-      rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
       unset rvm_ruby_patch_level
-      if match "$rvm_ruby_version" "^1.4" ; then
+      if [[ "$rvm_head_flag" -eq 1 ]] ; then
+        rvm_ruby_version="head"
+        rvm_ruby_string="jruby-head"
+        rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
+        rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
+      elif match "$rvm_ruby_version" "^1.4" ; then
+        rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
         rvm_ruby_version="1.4.0RC3"
         rvm_ruby_string="jruby-1.4.0RC3"
         rvm_package_file="$rvm_ruby_interpreter-bin-${rvm_ruby_version}"
       else
+        rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
+        rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
         rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
         rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
       fi
-      rvm_url="http://jruby.kenai.com/downloads/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.tar.gz"
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
     ;;
@@ -322,7 +330,7 @@ __rvm_ruby_string() {
 
   # Unspecified version
   if [[ -z "$rvm_ruby_version" ]] ; then
-      rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
+    rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "${rvm_ruby_interpreter}_version")"}
   fi
   rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
 

data/scripts/update

@@ -23,8 +23,8 @@ done
 
 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 ; do
-  mkdir -p $rvm_path/$dir_name
-  /bin/cp -Rf $source_dir/$dir_name $rvm_path
+  mkdir -p "$rvm_path/$dir_name"
+  cp -Rf "$source_dir/$dir_name" "$rvm_path"
 done ; unset dir_name
 
 for file_name in rvm-prompt gemsync ; do
@@ -53,18 +53,17 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
       actual_file="$file"
     fi
 
-    grep 'rvm\/bin\/rvm' $actual_file > /dev/null
+    grep 'rvm\/bin\/rvm' "$actual_file" > /dev/null
     if [[ $? -eq 0 ]] ; then
-      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
-      rm -f $actual_file.orig
+      sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' "$actual_file"
+      rm -f "$actual_file.orig"
     fi
 
     if [[ -f ~/.profile ]] ; then
-      grep '.profile' $actual_file > /dev/null
+      grep '.profile' "$actual_file" > /dev/null
       if [[ $? -gt 0 ]] ; then
         profile=~/.profile
-        echo -e "\n" >> $actual_file
-        echo "source $profile" >> $actual_file
+        echo -e "\nsource ${profile}" >> "$actual_file"
       fi
     fi
   fi
@@ -88,6 +87,8 @@ if [[ "Linux" = "$system" ]] ; then
     echo -e "       $ sudo aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "    $item For ree (if you wish to use it) you will need:"
     echo -e "       $ sudo aptitude install libreadline5-dev libssl-dev bison"
+    echo -e "    $item For 1.9.X (if you wish to use it) we additionally recommend:"
+    echo -e "       $ sudo aptitude install libxml2-dev"
 
   elif [[ ! -z "$rvm_emerge_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"

data/scripts/utility

@@ -44,7 +44,7 @@ function __rvm_debug {
     __rvm_log "debug" "ARCHFLAGS: $ARCHFLAGS"
     __rvm_log "debug" "LDFLAGS: $LDFLAGS"
     __rvm_log "debug" "CFLAGS: $CFLAGS"
-    __rvm_log "debug" "/Developer/SDKs/*:$(ls /Developer/SDKs/ | tr "\n" ',')"
+    __rvm_log "debug" "/Developer/SDKs/*:$(basename -a /Developer/SDKs/* | tr "\n" ',')"
   fi
 
   for file_name in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
@@ -62,7 +62,7 @@ function __rvm_debug {
   __rvm_log "debug" "gem sources:\n$(gem sources | awk '/gems/')"
 
   if [[ -f "$rvm_path/bin/rvm" ]] ; then
-    __rvm_log "error" "rvm script in bin! \n$(ls -laht $rvm_path/bin/rvm)"
+    __rvm_log "error" "rvm script in bin! \n$(\ls -laht $rvm_path/bin/rvm)"
   fi
 }
 
@@ -128,7 +128,7 @@ __rvm_cleanup_variables() {
 }
 
 __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
+  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
 }
 
 # TODO: root user loadng of /etc/rvmrc
@@ -137,7 +137,7 @@ function __rvm_load_rvmrc {
 }
 
 function __rvm_bin_scripts {
-  for rvm_ruby_binary in $(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null) ; do
+  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
@@ -385,13 +385,14 @@ __rvm_list() {
   if [[ ! -z "$rvm_all_flag" ]] ; then
     svn list http://svn.ruby-lang.org/repos/ruby/tags/ | grep 'v1_[8|9]' | sed 's#^v1_##' | sed 's#/$##' | awk -F'_' '{print "1."$1"."$2 " -l "$3}' | sed 's#p$##'
     echo -e "jruby 1.2.0\njruby 1.3.0\njruby (1.3.1, the default)\njruby 1.4.1\njruby --head"
-    echo -e "rbx head (rubinius head, the default)\nrbx head --jit"
-    echo -e "ree 1.8.6 --head\nree (1.8.7, the default)"
+    echo -e "rbx (rubinius head, the default)\nrbx-head --jit"
+    echo -e "ree 1.8.6-head\nree (1.8.7, the default)"
+    echo -e "macruby-nightly (macruby-nightly, the default)\nmacruby-head"
     echo -e "mput head (shyouhei head, the default)"
   else
     current_ruby="$(which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
     echo -e "\nruby:\n"
-    for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }') ; do
+    for version in $(\ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }') ; do
       string=$($rvm_path/$version/bin/ruby -v)
       if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $version : $string"
@@ -402,7 +403,7 @@ __rvm_list() {
     done ; unset version
 
     echo -e "\nree:\n"
-    for version in $(/bin/ls $rvm_path/ 2> /dev/null | awk '/ree-.*/ { print $NF }') ; do
+    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/ree-.*/ { print $NF }') ; do
       string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
       if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $version : $string"
@@ -413,7 +414,7 @@ __rvm_list() {
     done ; unset version
 
     echo -e "\nmput:\n"
-    for version in $(/bin/ls $rvm_path/ 2> /dev/null | awk '/mput-.*/ { print $NF }') ; do
+    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/mput-.*/ { print $NF }') ; do
       string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
       if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $version : $string"
@@ -424,7 +425,7 @@ __rvm_list() {
     done ; unset version
 
     echo -e "\njruby:\n"
-    for version in $(/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }') ; do
+    for version in $(\ls $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }') ; do
       string=$($rvm_path/$version/bin/ruby -v)
       if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $version : $string"
@@ -435,7 +436,7 @@ __rvm_list() {
     done ; unset version
 
     echo -e "\nrbx:\n"
-    # for version in $(/bin/ls $rvm_path/ 2> /dev/null | awk '/rbx-.*/ { print $NF }') ; do
+    # for version in $(\ls $rvm_path/ 2> /dev/null | awk '/rbx-.*/ { print $NF }') ; do
     for version in "rbx-head" ; do
       if [[ -f "$rvm_path/$version/bin/ruby" ]] ; then
         string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
@@ -451,7 +452,7 @@ __rvm_list() {
 
     if [[ "Darwin" = "$(uname)" ]] ; then
       echo -e "\nmacruby:\n"
-      for version in $(/bin/ls $rvm_path/ 2> /dev/null | awk '/macruby-.*/ { print $NF }') ; do
+      for version in $(\ls $rvm_path/ 2> /dev/null | awk '/macruby-.*/ { print $NF }') ; do
         string="$($rvm_path/$version/bin/ruby -v | tr "\n" ' ' )"
         if [[ "$version" = "$current_ruby" ]] ; then
           echo -e "=> $version : $string"
@@ -650,7 +651,7 @@ __rvm_do() {
         rvm_ruby_string="$(dirname $bin_line | xargs dirname | xargs basename)"
         __rvm_ruby_do
       fi
-    done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
+    done < <(\ls $rvm_path/*/bin/ruby 2> /dev/null)
   fi
 
   if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
@@ -787,7 +788,7 @@ function __rvm_readline_install {
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   cd "$rvm_src_path/$package-$version"
   if [[ "Darwin" = "$(uname)" ]] ; then
-    #sdk=$(ls -t /Developer/SDKs/ | head -n 1)
+    #sdk=$(\ls -t /Developer/SDKs/ | head -n 1)
     #CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
     #LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
     #export CFLAGS LDFLAGS
@@ -878,7 +879,7 @@ __rvm_make_flags() {
     fi
 
     if [[ -z "$rvm_sdk" ]] ; then
-      rvm_sdk="$(ls /Developer/SDKs/ | sort | tail -n 1)"
+      rvm_sdk="$(basename -a /Developer/SDKs/* | sort | tail -n 1)"
     fi
 
     CFLAGS="-isysroot /Developer/SDKs/$rvm_sdk $rvm_archflags" ; export CFLAGS
@@ -895,7 +896,7 @@ __rvm_monitor() {
     changed_test_files=() ; changed_spec_files=()
 
     if [[ -d "test/" ]] ; then
-      test_files=($(/bin/ls test/**/*_test.rb))
+      test_files=($(\ls test/**/*_test.rb))
       for file in "${test_files[@]}"; do
         if [[ $(timestamp $file) -gt $timestamp ]] ; then
           array_push $changed_test_files
@@ -904,7 +905,7 @@ __rvm_monitor() {
     fi
 
     if [[ -d "spec/" ]] ; then
-      spec_files=($(/bin/ls spec/**/*_spec.rb))
+      spec_files=($(\ls spec/**/*_spec.rb))
       for file in "${spec_files[@]}"; do
         if [[ $(timestamp $file) -gt $timestamp ]] ; then
           array_push $changed_spec_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.71
+  version: 0.0.72
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 -04:00
+date: 2009-11-02 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []