rvm 0.1.41 → 0.1.42

data/scripts/list

@@ -2,12 +2,16 @@
 
 if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
+source "$rvm_scripts_path/utility"
+
 list_gemsets() {
-  echo
-  ruby=$(command -v ruby) ; current_ruby=""
-  if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
-    current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
+  if [[ "$(echo $rvm_ruby_args | awk '{print $2}')" = "strings" ]]; then
+    list_gemset_strings
+    return 0
   fi
+  echo
+
+  current_ruby="$(__rvm_environment_identifier)"
 
   printf "rvm gemsets\n"
   for version in $(\ls $rvm_gems_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
@@ -74,6 +78,11 @@ list_strings() {
   echo $(\ls $rvm_rubies_path)
 }
 
+# This is meant to be used with scripting.
+list_gemset_strings() {
+  \ls $rvm_gems_path/ 2>/dev/null | xargs -- basename | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort
+}
+
 # This is meant to be used with scripting.
 list_known_strings() {
   cat "$rvm_config_path/known" | sed -e 's/#.*$//g' -e 's/(//g' -e 's/)//g' | sort -r | uniq
@@ -90,10 +99,8 @@ list_known() {
 
 list_rubies() {
   echo
-  ruby=$(command -v ruby) ; current_ruby=""
-  if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
-    current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
-  fi
+
+  current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
 
   printf "rvm rubies\n"
   for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
@@ -148,6 +155,7 @@ elif [[ "ruby_svn_tags" = "$action" ]] ; then
   list_ruby_svn_tags
 else # help
   printf "\nUsage:  rvm list {known,gemsets,default,rubies,strings,known_strings}"
+  false
 fi
 
 exit $?

data/scripts/log

@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
+# When rvm_silence_logging is set, don't show anything.
+[[ -n "$rvm_silence_logging" ]] && exit 0
+
 if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 
-message=$1
+message="$(echo "$1" | sed 's/%/%%/g')"
 
 if [[ -z "$rvm_interactive" ]] || [[ -z "$TERM" ]] || [[ "unknown" = "$TERM" ]] ; then
   case "$level" in

data/scripts/manage

@@ -6,6 +6,13 @@ original_ruby_string=$rvm_ruby_string
 source "$rvm_scripts_path/base"
 source "$rvm_scripts_path/patches"
 
+__rvm_check_for_clang() {
+  if [[ -n "$rvm_clang_flag" ]] && ! command -v clang >/dev/null ; then
+    $rvm_scripts_path/log "fail" "You passed the --clang option and clang isn't in your path. Please try again / don't use --clang"
+    return 1
+  fi
+}
+
 # Checks for bison, returns zero iff it is found
 __rvm_check_for_bison() {
   if [[ "$rvm_head_flag" -gt 0 ]]; then
@@ -60,7 +67,7 @@ __rvm_install_source() {
 
   $rvm_scripts_path/log "info" "Installing Ruby from source to: $rvm_ruby_home"
   __rvm_pushpop "$rvm_src_path"
-  if [[ ! -z "$rvm_force_flag" ]] ; then rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
+  if [[ -n "$rvm_force_flag" ]] ; then rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
 
   result=0
   __rvm_fetch_ruby
@@ -91,7 +98,7 @@ __rvm_install_source() {
     fi
   fi
 
-  if [[ ! -z "$rvm_ruby_configure" ]] ; then
+  if [[ -n "$rvm_ruby_configure" ]] ; then
     __rvm_run "configure" "$rvm_ruby_configure"
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while configuring. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -101,7 +108,9 @@ __rvm_install_source() {
     if [[ "ree" != "$rvm_ruby_interpreter" ]]; then
       __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
     fi
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
+
+    local configure_command="./configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags $configure_parameters"
+    __rvm_run "configure" "$configure_command" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while running configure. Aborting the installation." ; __rvm_pushpop ; return $result
     fi ; unset configure_parameters db_configure_flags
@@ -140,13 +149,18 @@ __rvm_install_ruby() {
 
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
-  if [[ ! -z "$RUBYOPT" ]] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
+  if [[ -n "$RUBYOPT" ]] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
+  
+  # Check for clang if the flag is set  
+  __rvm_check_for_clang
+  local result="$?"
+  [[ "$result" -gt 0 ]] && return $result
 
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
         if [[ "$rvm_head_flag" = 1 ]] ; then
-          if [[ ! -z "$rvm_llvm_flag" ]] ; then
+          if [[ -n "$rvm_llvm_flag" ]] ; then
             $rvm_scripts_path/package llvm install
           fi
           macruby_path="/usr/local/bin"
@@ -217,7 +231,7 @@ RubyWrapper
     ;;
 
     ree)
-      if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
+      if [[ -n "$(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_scripts_path/log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
         __rvm_pushpop "$rvm_src_path"
@@ -242,7 +256,7 @@ RubyWrapper
         builtin cd "$rvm_ruby_src_path"
 
         mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
-        if [[ ! -z "$rvm_ruby_configure_flags" ]] ; then
+        if [[ -n "$rvm_ruby_configure_flags" ]] ; then
           rvm_ruby_configure_flags="$(echo $rvm_ruby_configure_flags | sed 's#--#-c --#g')"
         fi
 
@@ -306,7 +320,9 @@ RubyWrapper
           $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
 
-        mv $rvm_src_path/rubinius-${rvm_ruby_version} ${rvm_ruby_src_path}
+        # Remove the left over folder first.
+        rm -rf "$rvm_ruby_src_path"
+        mv "$rvm_src_path/rubinius-${rvm_ruby_version}" "$rvm_ruby_src_path"
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
         #rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_interpreter-$rvm_ruby_version"
@@ -388,7 +404,7 @@ RubyWrapper
       fi
 
       builtin cd "$rvm_ruby_src_path"
-      if [[ ! -z "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
+      if [[ -n "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
 
       mkdir -p "$rvm_ruby_home/bin/"
       if $rvm_scripts_path/match "$rvm_ruby_version" "1\.3" || $rvm_scripts_path/match "$rvm_ruby_version" "1\.2" ; then
@@ -444,7 +460,7 @@ RubyWrapper
 
       __rvm_pushpop $rvm_src_path
 
-      if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ ! -z "$rvm_force_flag" ]] ; then
+      if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ -n "$rvm_force_flag" ]] ; then
         rm -rf "$rvm_src_path/$rvm_ruby_string/" "$rvm_src_path/$rvm_ruby_string/"
         __rvm_fetch_ruby
         result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -452,7 +468,7 @@ RubyWrapper
         fi
       fi
 
-      if [[ ! -z "$rvm_head_flag" ]] ; then
+      if [[ -n "$rvm_head_flag" ]] ; then
         builtin 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}"}"
@@ -497,7 +513,7 @@ RubyWrapper
       done ; unset binary
 
       builtin cd "$rvm_ruby_home"
-      if [[ ! -z "$rvm_head_flag" ]] ; then
+      if [[ -n "$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
@@ -632,14 +648,15 @@ RubyWrapper
 
       if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
           (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
-      elif [[ ! -z "$rvm_ruby_configure" ]] ; then
+      elif [[ -n "$rvm_ruby_configure" ]] ; then
         __rvm_run "configure" "$rvm_ruby_configure"
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to configure the source. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
 
       elif [[ -s ./configure ]] ; then
-          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..."
+          local configure_command="./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags"
+          __rvm_run "configure" "" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..."
           result=$? ; if [[ "$result" -gt 0 ]] ; then
             $rvm_scripts_path/log "error" "There has been an error while trying to configure the source. Aborting the installation." ; __rvm_pushpop ; return $result
           fi
@@ -690,7 +707,7 @@ RubyWrapper
 
   rvm_hook="after_install" ; source $rvm_scripts_path/hook
 
-  if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
+  if [[ -n "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
 __rvm_fetch_from_github() {
@@ -735,7 +752,7 @@ __rvm_fetch_ruby() {
     fi
 
     # Only re-extract if forced.
-    if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ ! -z "$rvm_force_flag" ]] ; then
+    if [[ ! -d "$rvm_src_path/$rvm_ruby_string" ]] || [[ -n "$rvm_force_flag" ]] ; then
       if [[ "tar.gz" = "$rvm_archive_extension" ]] || [[ "tgz" = "$rvm_archive_extension" ]] ; then
         __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | gunzip | tar xf - -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
         result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -752,7 +769,7 @@ __rvm_fetch_ruby() {
     fi
   else
     mkdir -p "$rvm_repo_path"
-    if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
+    if [[ -n "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_repo_path/.git" ]] ; then
         builtin cd $rvm_ruby_repo_path
         if [[ -z "$rvm_ruby_revision" ]] ; then
@@ -780,10 +797,10 @@ __rvm_fetch_ruby() {
         fi
       fi
     else
-      if [[ ! -z "$rvm_ruby_tag" ]] ; then
+      if [[ -n "$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//')"}"
-      elif [[ -z "$rvm_ruby_version" ]] && [[ ! -z "$rvm_head_flag" ]] ; then
+      elif [[ -z "$rvm_ruby_version" ]] && [[ -n "$rvm_head_flag" ]] ; then
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
       elif [[  "$rvm_major_version" = "9" ]] ; then
         if [[ -z "$rvm_minor_version" ]] || [[ "$rvm_minor_version" = 3 ]] ; then
@@ -798,7 +815,7 @@ __rvm_fetch_ruby() {
       fi
 
       rvm_rev=""
-      if [ ! -z "$rvm_ruby_revision" ] ; then
+      if [ -n "$rvm_ruby_revision" ] ; then
         rvm_rev="-$rvm_ruby_revision"
       fi
 
@@ -807,7 +824,7 @@ __rvm_fetch_ruby() {
         $rvm_scripts_path/log "info" "Updating ruby from $rvm_url"
         __rvm_run "svn.switch" "svn switch $rvm_url"
         __rvm_run "svn.update" "svn update"
-        if [[ ! -z "$rvm_rev" ]] ; then
+        if [[ -n "$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
@@ -838,7 +855,7 @@ __rvm_check_default() {
 __rvm_uninstall_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
-  if [[ ! -z "$rvm_ruby_string" ]] ; then
+  if [[ -n "$rvm_ruby_string" ]] ; then
     for dir in $rvm_rubies_path ; do
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
@@ -862,7 +879,7 @@ __rvm_uninstall_ruby() {
 __rvm_remove_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
-  if [[ ! -z "$rvm_ruby_string" ]] ; then
+  if [[ -n "$rvm_ruby_string" ]] ; then
     for dir in $rvm_src_path $rvm_rubies_path ; do
       if [[ -d $dir/$rvm_ruby_string ]] ; then
         $rvm_scripts_path/log "info" "Removing $dir/$rvm_ruby_string..."
@@ -890,7 +907,7 @@ __rvm_remove_ruby() {
 }
 
 __rvm_remove_gemsets() {
-  if [[ ! -z "$rvm_gems_flag" ]] ; then
+  if [[ -n "$rvm_gems_flag" ]] ; then
     $rvm_scripts_path/log "info" "Removing $rvm_ruby_string gemsets..."
     gemsets="$rvm_gems_path/$rvm_ruby_string $(\ls -d "${rvm_gems_path}"/* | awk '/'$rvm_ruby_string'@/')"
     for gemset in $gemsets ; do
@@ -927,7 +944,7 @@ __rvm_remove_aliases() {
 }
 
 __rvm_remove_archives() {
-  if [[ ! -z "$rvm_archive_flag" ]] ; then
+  if [[ -n "$rvm_archive_flag" ]] ; then
     $rvm_scripts_path/log "info" "Removing $rvm_ruby_string archives..."
     rm -f $rvm_archives_path/${rvm_ruby_package_file}.${rvm_archive_extension}
   fi
@@ -987,7 +1004,7 @@ __rvm_generate_default_docs() {
 }
 
 __rvm_rubygems_setup() {
-  if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
+  if [[ -n "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ -n "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
     install=0
   elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
     install=0
@@ -1028,9 +1045,9 @@ __rvm_rubygems_setup() {
       ruby_lib_gem_path="${directory_name}/${version_number}"
     fi
     unset directory_name version_number
-  elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
+  elif [[ -n "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
     # Hands off rubygems for rbx & jruby
-    if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version" ; fi
+    if [[ -n "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Skipping rubygems update for $rvm_ruby_version" ; fi
     ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/jruby"
   else
     $rvm_scripts_path/log "info" "Installing rubygems dedicated to $rvm_ruby_string..."
@@ -1067,7 +1084,7 @@ __rvm_rubygems_setup() {
 
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
 
-    if [[ ! -z "$rvm_major_version" ]] ; then
+    if [[ -n "$rvm_major_version" ]] ; then
       ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/${rvm_release_version}.$rvm_major_version"
     else
       ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/$interpreter"
@@ -1104,12 +1121,12 @@ __rvm_inject_ruby_shebang() {
 __rvm_inject_gem_env() {
   __rvm_actual_file $1
   if [[ -f "$actual_file" ]] ; then
-    if [[ ! -z "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
+    if [[ -n "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
       string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:' + ENV['PATH']\nENV['BUNDLE_PATH']=ENV['BUNDLE_PATH'] || '$rvm_ruby_gem_home'\n"
-    elif [[ ! -z "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
+    elif [[ -n "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
       string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
     fi
-    if [[ ! -z "$string" ]] ; then
+    if [[ -n "$string" ]] ; then
       awk "NR==2 {print \"$string\"} {print}" "$actual_file" > "$actual_file.new"
       mv $actual_file.new $actual_file ; chmod +x "$actual_file"
       unset string
@@ -1133,8 +1150,8 @@ __rvm_manage_rubies() {
 
   local manage_result=0
 
-  if [[ ! -z "$rubies_string" ]] ;then
-    for rvm_ruby_string in $(echo $rubies_string | tr ',' ' ') ; do
+  if [[ -n "$rubies_string" ]] ;then
+    for rvm_ruby_string in $(echo "$rubies_string" | tr ',' ' ') ; do
       eval "__rvm_${rvm_action}_ruby"
       __rvm_unset_ruby_variables
     done

data/scripts/md5

@@ -2,17 +2,16 @@
 
 if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-file=$1 ; md5=$2
+file="$1"
+md5="$2"
 
 if [[ "Linux" = "$(uname)" ]] ; then
   command="md5sum"
-  #md5sum --status -c "$file"
 elif [[ "Darwin" = "$(uname)" ]] ; then
-  #md5 --status -c "$1"
-  command="/sbin/md5"
+  command="/sbin/md5 -q"
 fi
 
-file_md5=$($command $file | awk '{print $NF}')
+file_md5=$($command "$file" | awk '{print $1}')
 
 if [[ "$file_md5" = "$md5" ]] ; then
   exit 0

data/scripts/package

@@ -26,7 +26,7 @@ install_package() {
     __rvm_run "$package/extract" "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
   elif [[ "$archive_format" = "zip" ]] ; then
     $rvm_scripts_path/fetch "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
-  __rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
+    __rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
   else
     printf "\nUnrecognized archive format '$archive_format'" ; return 1
   fi
@@ -71,14 +71,36 @@ curl() {
 openssl() {
   package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
-    if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
-      export openssl_os="os/compiler darwin64-x86_64-cc"
+    if [[ ! -z "$rvm_archflags" ]]; then
+      if $rvm_scripts_path/match "$rvm_archflags" "64"; then
+        hw_cpu64bit=1
+      fi
+      if $rvm_scripts_path/match "$rvm_archflags" "ppc"; then
+        hw_machine="Power Macintosh"
+      fi
     else
-      export openssl_os="os/compiler darwin-i386-cc"
+      hw_machine=$(sysctl hw.machine | awk -F: '{print $2}' | sed 's/^ //')
+      hw_cpu64bit=$(sysctl hw.cpu64bit_capable | awk '{print $2}')
+    fi
+    if [[ "Power Macintosh" = "$hw_machine" ]] ; then
+      if [[ $hw_cpu64bit = 1 ]]; then
+        openssl_os="darwin64-ppc-cc"
+      else
+        openssl_os="darwin-ppc-cc"
+      fi
+    else
+      if [[ $hw_cpu64bit = 1 ]]; then
+        openssl_os="darwin64-x86_64-cc"
+      else
+        openssl_os="darwin-i386-cc"
+      fi
     fi
     configure_command="./Configure"
     patches="$rvm_patches_path/$package/Makefile.org.patch,$rvm_patches_path/$package/crypto-Makefile.patch"
-
+    # Don't use -j option for make OpenSSL
+    if [[ ! -z "$rvm_make_flags" ]] ; then
+      rvm_make_flags=$(echo $rvm_make_flags | sed -e "s/-j[[:space:]]*[[0-9]]*//")
+    fi
   else
     configure_command="./config"
   fi
@@ -162,7 +184,7 @@ if [[ ! -z "$library" ]] ; then
     $rvm_scripts_path/log "error" "Package '${library}' is unknown."
   fi
 else
-  $rvm_scripts_path/log "info" "Usage: 'rvm package {install,uninstall} {openssl,zlib,readline,iconv,ncurses}'"
+  $rvm_scripts_path/log "info" "Usage: 'rvm package {install,uninstall} {readline,iconv,curl,openssl,zlib,autoconf,ncurses,pkgconfig,gettext,glib,mono,llvm,libxml2}'"
   exit 1
 fi
 

data/scripts/rubygems

@@ -57,9 +57,9 @@ rubygems_setup() {
     __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
     if [[ "$result" == 0 ]] ; then
-      $rvm_scripts_path/log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
+      $rvm_scripts_path/log "info" "Installation of rubygems completed successfully."
     else
-      $rvm_scripts_path/log "warning" "Installation of rubygems $rvm_ruby_package_name did not complete successfully."
+      $rvm_scripts_path/log "warning" "Installation of rubygems did not complete successfully."
     fi
 
     if [[ ! -z "$rvm_major_version" ]] ; then

data/scripts/rvm

@@ -22,13 +22,13 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
     if [[ "root" = "$(whoami)" ]] ; then
       rvm_prefix="/usr/local"
     else
-      rvm_prefix="$HOME"
+      rvm_prefix="$HOME/."
     fi
   fi
 
   if [[ -z "$rvm_path" ]] ; then
     unset rvm_path
-    if [[ "root" = "$(whoami)" ]] ; then
+    if  [[ "root" = "$(whoami)" ]] ; then
       rvm_path="$rvm_prefix/rvm"
     else
       if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then