rvm 0.0.60 → 0.0.61

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.60"
+  s.version = "0.0.61"
 
   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-18}
+  s.date = %q{2009-10-20}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter installations and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cli

@@ -5,7 +5,7 @@ function __rvm_meta {
   rvm_meta_author_email="wayneeseguin@gmail.com"
   rvm_meta_website="http://rvm.beginrescueend.com/"
   rvm_meta_version="$(cat $rvm_path/lib/VERSION.yml | tail -n 3 | sed 's/^.*: //g' | tr "\n" '.' | sed 's/\.$//')"
-  rvm_meta_updated="2009.10.18"
+  rvm_meta_updated="2009.10.19"
 }
 
 function __rvm_version { __rvm_meta ; echo "rvm $rvm_meta_version ($rvm_meta_updated) [$rvm_meta_website]" ; }
@@ -107,7 +107,7 @@ function __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|iconv|gemsync|update)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|readline|gemsync|update|iconv|openssl|ncurses|zlib|readline)
         rvm_action=$rvm_token
       ;;
 
@@ -135,7 +135,7 @@ function __rvm_parse_args {
         rvm_ruby_interpreter="$rvm_token"
         rvm_action="${rvm_action:-use}"
         #if [ ! -z "$(echo $1 | awk '/^[0-9]/')" ] ; then
-        if [[ $1 =~ ^[0-9] ]] ; then
+        if [[ ! -z "$1" ]] && [[ "$1" =~ ^[0-9] ]] ; then
           rvm_ruby_version=$1 ; shift
         fi
       ;;
@@ -181,7 +181,7 @@ function __rvm_parse_args {
 
       do|ruby|rake|gem|rubydo|rakedo|gemdo)
         if [ "do" = "$rvm_action" ] ; then rvm_action="ruby" ; fi
-        rvm_action=$(echo $rvm_token | sed 's/do//g')
+        rvm_action=$(echo $rvm_token | sed 's#do##g')
 
         if [ "rake" = "$rvm_action" -o "$rvm_action" = "gem" -o "$rvm_action" = "ruby" ] ; then
           if [ -z "$1" ] ; then
@@ -356,11 +356,11 @@ function __rvm_parse_args {
       tests|specs)          rvm_action="tests"                ;;
 
       --trace)
-        eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
+        eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
         set -x
       ;;
       --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--all|--dump|--summary|--jit|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete)
-        eval "rvm_$(echo $rvm_token | sed 's/-//g')_flag=1"
+        eval "rvm_$(echo $rvm_token | sed 's#-##g')_flag=1"
       ;;
 
       reboot|flush|asdf|damnit|wtf|argh|work|workdamnit|BOOM|boom|wth)
@@ -376,10 +376,10 @@ function __rvm_parse_args {
         if [ ! -z "$rvm_token" ] ; then
           if [ "gems" = "$rvm_action" ] ; then
             if [ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then
-              rvm_file_name="$(echo $rvm_token | sed 's/\.gems//g').gems"
+              rvm_file_name="$(echo $rvm_token | sed 's#\.gems##g').gems"
               # elif [ ! -z "$(echo $rvm_token | awk '/\.gems$/')" ] ; then
             else
-              rvm_gem_set_name="$(echo $rvm_token | sed 's/\.gems//g')"
+              rvm_gem_set_name="$(echo $rvm_token | sed 's#\.gems##g')"
               rvm_file_name="$rvm_gem_set_name.gems"
             fi
           elif [ ! -z "$(echo $rvm_token | awk '/,/')" ] ; then
@@ -391,11 +391,11 @@ function __rvm_parse_args {
             rvm_gem_set_name="$(echo $rvm_token | awk -F'%' '{print $2}')"
             rvm_ruby_string="$(echo $rvm_token | awk -F'%' '{print $1}')"
           #elif [ ! -z "$(echo $rvm_token | awk '/^[0-9].[0-9]/')" ] ; then
-          elif [[ $rvm_token =~ ^[0-9].[0-9] ]] ; then
+          elif [[ ! -z "$rvm_token" ]] && [[ "$rvm_token" =~ ^[0-9].[0-9] ]] ; then
             rvm_ruby_string="$rvm_token"
           else
             if [ ! -z "$(echo $rvm_token | awk '/\.rb$/{print}')" ] ; then # we have a specified ruby script
-            #if [[ ! $rvm_token =~ \.rb$ ]] ; then # we have a specified ruby script
+            #if [[ ! -z "$rvm_token" ]] && [[ " ! $rvm_token =~ \.rb$ ]] ; then # we have a specified ruby script
               rvm_ruby_args=$rvm_token
               rvm_ruby_file=$rvm_token
               if [ -z "$rvm_action" ] ; then
@@ -449,7 +449,6 @@ function rvm {
     implode)    __rvm_implode          ; result=$? ;;
     update)     __rvm_update           ; result=$? ;;
     readline)   __rvm_readline_install ; result=$? ;;
-    iconv)      __rvm_iconv_install    ; result=$? ;;
     reboot)     __rvm_reboot           ; result=$? ;;
     usage|help) __rvm_usage            ; result=$? ;;
     benchmark)  __rvm_benchmark        ; result=$? ;;
@@ -457,6 +456,11 @@ function rvm {
     inspect)    __rvm_inspect          ; result=$? ;;
     gems)       __rvm_gems             ; result=$? ;;
 
+    iconv|openssl|ncurses|zlib|readline)
+      __rvm_${rvm_action}_install
+      result=$?
+    ;;
+
     install|uninstall|remove)
       __rvm_manage_rubies
       result=$?

data/scripts/gems

@@ -34,7 +34,7 @@ __rvm_gems_select() {
       rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
     fi
 
-    if [ ! -z "$rvm_gem_set_name" ] && [[ ! "$rvm_gem_set_name" =~ ^\d\.\d ]] ; then
+    if [[ ! -z "$rvm_gem_set_name" ]] && [[ ! "$rvm_gem_set_name" =~ ^\d\.\d ]] ; then
       rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
     else
       if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
@@ -119,10 +119,10 @@ __rvm_gems_dump() {
   touch $rvm_file_name
   echo "# $rvm_file_name generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
 
-  for gem in $(gem list | sed 's/[\(|\)]//g' | sed 's/, /,/g' | tr ' ' ';') ; do
+  for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';') ; do
     name="$(echo $gem | awk -F';' '{print $1}')"
     if [ -z "$rvm_latest_flag" ] ; then
-      versions="$(echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g')"
+      versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
       for version in $versions ; do
         echo "$name -v$version" >> $rvm_file_name
       done ; unset version versions
@@ -150,19 +150,26 @@ __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/\.gemspec$//' 2> /dev/null)
+    rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#\.gemspec$##' 2> /dev/null)
     while read line
     do # Keep this on 2nd line :( bash fail.
       # TODO: Switch to a different field separator than ; to allow for evals
       gem="$(echo $line | awk -F';' '{print $1}')"
-      gem_prefix="$(echo $line | awk -F';' '{print $2}')"
-      gem_name="$(echo $gem | awk '{print $1}')"
-      gem_version="$(echo $gem | awk '{print $2}' | sed 's/^.*-v[=]*[ ]*//' )"
-      gem_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s/-v[=]*[ ]*$gem_version//")"
+      if [[ ! -z "$gem" ]] && [[ "$gem" =~ \.gem$ ]] ; then
+        gem_prefix="$(echo $line | awk -F';' '{print $2}')"
+        gem_name="$(echo $gem | awk '{print $1}')"
+        gem_version="$(echo $gem | awk '{print $2}' | sed 's#^.*-v[=]*[ ]*##' )"
+        gem_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s#-v[=]*[ ]*$gem_version##")"
+      else
+        gem_prefix="$(echo $line | awk -F';' '{print $2}')"
+        gem_name="$(echo $gem | awk '{print $1}')"
+        gem_version="$(echo $gem | awk '{print $2}' | sed 's#^.*-v[=]*[ ]*##' )"
+        gem_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s#-v[=]*[ ]*$gem_version##")"
+      fi
 
       if [ -f "$gem" ] ; then
-        gem_file_name="${gem}"
-      elif [[ "$gem" =~ ".gem$" ]] ; then
+        gem_file_name="$(basename $gem)"
+      elif [[ ! -z "$gem" ]] && [[ "$gem" =~ ".gem$" ]] ; then
         gem_file_name="${gem}"
       elif [ -z "$gem_version" ] ; then # no version
         gem_file_name="${gem_name}*.gem"
@@ -172,7 +179,7 @@ __rvm_gems_load() {
 
       if [ -z "$rvm_force_flag" -a -f "$rvm_ruby_gem_home/specifications/${gem_file_name/\.gem/.gemspec}" ] ; then
         unset gem
-        __rvm_log "info" "$(__color "green")$gem_name $gem_version$(__color "none") is already installed, skipping. (--force to re-install)"
+        __rvm_log "warn" "Skipping $(__color "yellow")$gem_name $gem_version$(__color "none") (--force to re-install)"
       else
         cache_file=$(/bin/ls -t "$rvm_gem_path/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)
         if [ -z "$cache_file" ] ; then
@@ -185,9 +192,9 @@ __rvm_gems_load() {
           fi
         else # cached
           gem_file_name="$(basename $cache_file)"
-          gem_string="$(echo "$gem_file_name" | sed 's/\.gem$//')"
+          gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
           if [ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}")" ] ; then
-            #if [[ $rvm_ruby_gem_list =~ $gem_string ]] ; then
+            #if [[ ! -z "$rvm_ruby_gem_list" ]] && [[ "$rvm_ruby_gem_list" =~ $gem_string ]] ; then
             if [ ! -z "$rvm_force_flag" ] ; then
               cp $cache_file $rvm_temp_path/$gem_file_name
               gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
@@ -200,17 +207,15 @@ __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.
-        if [ -z "$vars" ] ; 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"
-        else
-          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"
-        fi
+        __rvm_make_flags
+        __rvm_log "info" "Installing $gem_name $gem_version..."
+        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"
         eval $command > /dev/null 2>&1
         result=$?
         if [[ $result -eq 0 ]] ; then
-        __rvm_log "info" "$(__color "green")$gem_name $gem_version$(__color "none") installed. (--force to re-install)"
+        __rvm_log "info" "$(__color "green")$gem_name $gem_version$(__color "none") installed."
         else
-          __rvm_log "error" "$(__color "red")$gem_name $gem_version$(__color "none") failed to install. (--force to re-install)"
+          __rvm_log "error" "$(__color "red")$gem_name $gem_version$(__color "none") failed to install."
         fi
       fi
       unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string

data/scripts/ruby-installer

@@ -80,12 +80,6 @@ function __rvm_install_source {
   if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
     __rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
   elif [ -s ./configure ] ; then
-    if [ -d "$rvm_path/usr/include/readline/" ] ; then
-      configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/"
-    fi
-    if [ -d "$rvm_path/usr/include/iconv/" ] ; then
-      configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
-    fi
     __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)..."
     if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
     unset configure_parameters
@@ -119,7 +113,7 @@ function __rvm_install_ruby {
 
   if [ -z "$rvm_ruby_selected_flag" ]   ; then __rvm_select $* ; fi
   if [ ! -z "$RUBYOPT" ]      ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
-  if [ "$(uname)" = "Darwin" ] ; then ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS ; fi
+  __rvm_make_flags
 
   case "$rvm_ruby_interpreter" in
     macruby)
@@ -156,7 +150,7 @@ function __rvm_install_ruby {
         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
-        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems --no-tcmalloc $rvm_ruby_configure" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
+        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level --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/*
 

data/scripts/selector

@@ -88,8 +88,8 @@ function __rvm_select {
 
     ruby)
       if [ ! -z "$rvm_ruby_tag" ] ; then
-        rvm_ruby_version=$(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print 1 "." $2 "." $3 }')
-        # rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's/^v//' | sed 's/\///' | awk -F'_' '{print $4 }')
+        rvm_ruby_version=$(echo $rvm_ruby_tag | sed 's#^v##' | sed 's#/##' | awk -F'_' '{print 1 "." $2 "." $3 }')
+        # rvm_ruby_patch_level=$rvm_ruby_tag # $(echo $rvm_ruby_tag | sed 's#^v##' | sed 's#/##' | awk -F'_' '{print $4 }')
         if [ -z "$rvm_ruby_patch_level" ] ; then rvm_ruby_patch_level=$rvm_Ruby_tag ; fi
       fi
       if [ -z "$rvm_ruby_version" ] ; then rvm_ruby_version=$(__rvm_db "ruby_version") ; fi
@@ -133,7 +133,7 @@ function __rvm_select {
         if [ ! -z "$(echo $rvm_ruby_patch_level | awk '/^[0-9]/')" ] ; then
           rvm_ruby_patch_level="p$rvm_ruby_patch_level"
         fi
-        rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's/^pp/p/')" # sanity check, thanks sfpyra
+        rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')" # sanity check, thanks sfpyra
       fi
       rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
       rvm_ruby_home="${rvm_ruby_home:-"$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level"}"
@@ -212,7 +212,7 @@ function __rvm_use {
       rm -f $rvm_path/default
       rm -f $rvm_path/bin/default*
     else
-      RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
+      RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 
       echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:\$PATH ; export PATH" > $rvm_path/default
@@ -246,7 +246,7 @@ function __rvm_ruby_string {
   if [ "system" = "$rvm_ruby_interpreter" ] ; then
     rvm_ruby_string="system"
   elif [ ! -z "$rvm_ruby_string" ] ; then
-    ruby_string=$(echo "$rvm_ruby_string" | sed 's/ruby-enterprise/ree/g') # dash-antics
+    ruby_string=$(echo "$rvm_ruby_string" | sed 's#ruby-enterprise#ree#g') # dash-antics
     if [ ! -z "$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')" ] ; then
       rvm_gem_set_name=$(echo "$rvm_ruby_string" | awk -F'%' '{print $2}')
     fi

data/scripts/utility

@@ -82,12 +82,12 @@ __rvm_push() {
 }
 
 function __rvm_clean_path {
-  PATH=$(echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's/:$//')
+  PATH=$(echo $PATH | tr -s ':' '\n' | awk '!($0 in a){a[$0];print}' | tr -s '\n' ':' | sed 's#:$##')
   export PATH
 }
 
 function __rvm_remove_rvm_from_path {
-  PATH=$(echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's/:$//')
+  PATH=$(echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's#:$##')
   export PATH
 }
 
@@ -352,7 +352,7 @@ function __rvm_db {
   else
     value="$*"
     if [ "unset" = "$value" -o "delete" = "$value" ] ; then
-      sed -i.tmp "s/^$key=.*$//" $rvm_hash_file
+      sed -i.tmp "s#^$key=.*$\##" $rvm_hash_file
     else
       if [ -z "$value" ] ; then # get
         grep "^$key=" $rvm_hash_file | head -n 1 | awk -F'=' '{print $2}'
@@ -360,7 +360,7 @@ function __rvm_db {
         if [ -z "$(grep "^$key=" $rvm_hash_file)" ] ; then # append
           echo "$key=$value" >> $rvm_hash_file
         else # overwrite
-          sed -i.tmp "s/^$key=.*$/$key=$value/" $rvm_hash_file
+          sed -i.tmp "s#^$key=.*$\#$key=$value#" $rvm_hash_file
         fi
       fi
     fi
@@ -369,7 +369,7 @@ function __rvm_db {
 
 function __rvm_list {
   if [ "$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$//'
+    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)"
@@ -469,8 +469,6 @@ function __rvm_initialize {
   rvm_ruby_load_path="."
   rvm_ruby_require=""
 
-  if [ "Darwin" = "$(uname)" ] ; then rvm_archflags="${rvm_archflags:-'-arch i386 -arch x86_64'}" ; fi
-
   __rvm_clean_path
   rvm_result=$(echo $PATH | grep 'rvm\/bin:')
   if [ -z $rvm_result ] ; then
@@ -545,14 +543,14 @@ __rvm_reload() {
 __rvm_ruby_do() {
   __rvm_select
   __rvm_use
-  binary="$(echo $rvm_action | sed 's/do$//')"
+  binary="$(echo $rvm_action | sed 's#do$##')"
   if [ -x $rvm_ruby_home/bin/$binary ] ; then
     load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
     if [ "ruby" = "$binary" ] ; then
       if [ -z "$(echo $rvm_ruby_args | awk '/\.rb$/')" ] ; then
         #if [[ $rvm_ruby_args =~ '\.rb$' ]] ; then
         if [ -z "$prefix" ] ; then prefix="-S" ; fi
-        if [[ ! $rvm_ruby_args =~ $prefix ]] ; then
+        if [[ ! -z "$rvm_ruby_args" ]] && [[ ! "$rvm_ruby_args" =~ "$prefix" ]] ; then
           rvm_ruby_args="$prefix $rvm_ruby_args"
         fi
       fi
@@ -621,10 +619,10 @@ function __rvm_summary {
   export successes errors statuses
   summary="\nSummary:\n\n"
   if [ ${#successes[*]} -gt 0 ] ; then
-    summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's/ /, /g')\033[0m\n"
+    summary="$summary \033[0;32m${#successes[*]} successful: $(echo "${successes[*]}" | sed 's# #, #g')\033[0m\n"
   fi
   if [ ${#errors[*]} -gt 0 ] ; then
-    summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's/ /, /g')\033[0m\n"
+    summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's# #, #g')\033[0m\n"
   fi
   total=${#rubies[*]}
   if [ ! -z "$ZSH_VERSION" ] ; then array_start=1 ; else array_start=0 ; fi
@@ -654,8 +652,8 @@ function __rvm_yaml {
 function __rvm_json {
   json="{"
   json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
-  json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's/ /", "/g')" ],"
-  json="$json\n  \"errors\": [ "$(echo ${errors[*]} | sed 's/ /", "/g')" ],"
+  json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's# #", "#g')" ],"
+  json="$json\n  \"errors\": [ "$(echo ${errors[*]} | sed 's# #", "#g')" ],"
   json="$json\n  \"rubies\": {"
 
   total=${#rubies[*]}
@@ -753,6 +751,7 @@ function __rvm_inspect {
 # ruby supporting libraries:
 #
 function __rvm_readline_install {
+  __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="readline" ; version="5.2" ; archive_format="tar.gz"
   # TODO: Figure out how to list, grab and apply the patches
@@ -761,10 +760,10 @@ 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)
-    CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    export CFLAGS LDFLAGS
+    #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
     __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
   else
     __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared" "Configuring $package"
@@ -775,18 +774,80 @@ function __rvm_readline_install {
 }
 
 function __rvm_iconv_install {
+  __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
   __rvm_log "info" "Retrieving $package-$version.$archive_format"
   __rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
   __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"
-  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --disable-static --enable-shared" "Configuring $package."
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
   __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
   __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
   __rvm_pushpop
 }
 
+function __rvm_openssl_install {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
+  __rvm_log "info" "Retrieving $package-$version.$archive_format"
+  __rvm_fetch "http://www.openssl.org/source/$package-$version.tar.gz"
+  __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"
+  __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+function __rvm_zlib_install {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
+  __rvm_log "info" "Retrieving $package-$version.$archive_format"
+  __rvm_fetch "http://www.zlib.net/$package-$version.tar.gz"
+  __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"
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+function __rvm_ncurses_install {
+  __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
+  package="ncurses" ; version="5.7" ; archive_format="tar.gz"
+  __rvm_log "info" "Retrieving $package"
+  __rvm_fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz"
+  __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
+  cd "$rvm_src_path/$package-$version"
+  __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr --with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs" "Configuring $package."
+  __rvm_run "$package/make" "/usr/bin/make $rvm_make_flags" "Compiling $package"
+  __rvm_run "$package/make.install" "/usr/bin/make install" "Installing $package to $rvm_path/usr"
+  __rvm_pushpop
+}
+
+__rvm_make_flags() {
+  PATH=.rvm/usr/bin:$PATH ; export PATH
+  if [ "Darwin" = "$(uname)" ] ; then
+    sdk="$(/bin/ls -t /Developer/SDKs/ | head -n 1)"
+    if [ "Darwin" = "$(uname)" ] ; then
+      if [[ "$(sw_vers -productVersion)" =~ ^10.6 ]] ; then
+        rvm_archflags="-arch x86_64"
+        openssl_os="os/compiler darwin64-x86_64-cc"
+      else
+        rvm_archflags="-arch i386"
+        openssl_os="os/compiler darwin-i386-cc"
+      fi
+    fi
+    CFLAGS="-isysroot /Developer/SDKs/$sdk $rvm_archflags" ; export CFLAGS
+    LDFLAGS="-Wl,-syslibroot /Developer/SDKs/$sdk $rvm_archflags" ; export LDFLAGS
+    ARCHFLAGS="$rvm_archflags" ; export ARCHFLAGS
+  fi
+}
+
 __rvm_monitor() {
   if [ -d test/ ] ; then
     :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 -04:00
+date: 2009-10-20 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []