rvm 0.0.73 → 0.0.74

data/lib/VERSION.yml

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

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.73"
+  s.version = "0.0.74"
 
   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-02}
+  s.date = %q{2009-11-03}
   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

@@ -218,7 +218,7 @@ function __rvm_parse_args {
 
       -C|--configure)
         if [[ ! -z "$1" ]] ; then
-          rvm_ruby_configure="$(echo $1 | tr ',' ' ')"
+          rvm_ruby_configure_flags="$(echo $1 | tr ',' ' ')"
           shift
         else
           rvm_action="error"

data/scripts/ruby-installer

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-function __rvm_install_source {
+__rvm_install_source() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p "$rvm_ruby_log_path"
@@ -85,11 +85,11 @@ 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
+  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, 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_package_name, this may take a while depending on your cpu(s)..."
     if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     unset configure_parameters
   else
@@ -116,7 +116,7 @@ function __rvm_install_source {
   __rvm_pushpop
 }
 
-function __rvm_install_ruby {
+__rvm_install_ruby() {
 
   if [[ -z "$rvm_ruby_selected_flag" ]]  ; then __rvm_select $* ; fi
   if [[ ! -z "$RUBYOPT" ]]     ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
@@ -128,7 +128,7 @@ function __rvm_install_ruby {
         if [[ "$rvm_head_flag" = 1 ]] ; then
           macruby_path="/usr/local/bin"
           # TODO: configure & make variables should be set here.
-          rvm_ruby_configure=""
+          rvm_ruby_configure=" true "
           rvm_ruby_make="rake"
           rvm_ruby_make_install="sudo rake install"
           rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_repo_url")"
@@ -193,8 +193,10 @@ 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="$(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 [[ ! -z "$rvm_ruby_configure_flags" ]] ; then
+          rvm_ruby_configure_flags="$(echo $rvm_ruby_configure_flags | 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_flags" "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/*
 
@@ -394,7 +396,7 @@ RubyWrapper
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       rvm_ruby_repo_url=$rvm_shyouhei_repo_url
-      rvm_ruby_configure=" "
+      unset rvm_ruby_configure
       rvm_ruby_src_path=$rvm_ruby_home
       # rvm_ruby_make="rake"
       # rvm_ruby_make_install="rake install"
@@ -419,12 +421,12 @@ RubyWrapper
 
       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_ruby_configure
       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_flags $configure_parameters" "Configuring $rvm_ruby_package_name 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
-      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
@@ -464,7 +466,7 @@ RubyWrapper
   if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
-function __rvm_manage_rubies {
+__rvm_manage_rubies() {
   __rvm_state
   rubies=() ; successes=() ; errors=() ; statuses=()
   unset rvm_gem_set_name
@@ -503,7 +505,7 @@ function __rvm_manage_rubies {
   if [[ ! -z "$rvm_json_flag" ]]   ; then __rvm_json    ; fi
 }
 
-function __rvm_uninstall_ruby {
+__rvm_uninstall_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
   if [[ ! -z "$rvm_ruby_package_name" ]] ; then
@@ -524,7 +526,7 @@ function __rvm_uninstall_ruby {
   fi
 }
 
-function __rvm_remove_ruby {
+__rvm_remove_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$rvm_ruby_string" ]] ; then
@@ -544,7 +546,7 @@ function __rvm_remove_ruby {
   fi
 }
 
-function __rvm_post_install {
+__rvm_post_install() {
   binaries="${binaries:-"gem irb erb ri rdoc testrb rake"}"
   for binary in $(echo $binaries) ; do
     if [[ -e "$rvm_ruby_home/bin/$binary" ]] || [[ -e "$rvm_ruby_src_path/bin/$binary" ]] ; then
@@ -577,7 +579,7 @@ function __rvm_post_install {
   fi ; unset binary
 }
 
-function __rvm_rubygems_setup {
+__rvm_rubygems_setup() {
   if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] || [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^mput/')" ]] ; then
     # 1.9 has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
@@ -589,20 +591,20 @@ function __rvm_rubygems_setup {
 
   elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
     __rvm_log "debug" "Skipping rubygems update for $rvm_ruby_version"
-
   else
     __rvm_log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
     rvm_gem_package_name="rubygems-1.3.5"
     rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
-    if [[ -d "$rvm_src_path/$rvm_gem_package_name" ]] && [[ -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
-      cd "$rvm_src_path/$rvm_gem_package_name"
-    else
-      rm -rf "$rvm_src_path/$rvm_gem_package_name"
+
+    # Sanity check...
+    if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then rm -rf "$rvm_src_path/$rvm_gem_package_name" ; fi
+    if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
       __rvm_log "info" "Retrieving $rvm_gem_package_name"
       __rvm_fetch "$rvm_gem_url"
       mkdir -p "$rvm_src_path/$rvm_gem_package_name"
       __rvm_run "rubygems.extract" "tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_src_path" "Extracting $rvm_gem_package_name"
     fi
+    cd "$rvm_src_path/$rvm_gem_package_name"
     __rvm_run "rubygems.install" "GEM_PATH=$rvm_gem_path GEM_HOME=$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 -eq 0 ]] ; then
@@ -615,7 +617,7 @@ function __rvm_rubygems_setup {
   return $result
 }
 
-function __rvm_inject_ruby_shebang {
+__rvm_inject_ruby_shebang() {
   __rvm_actual_file $1
   if [[ -f "$actual_file" ]] ; then
     sed -i.orig -e "s=env [j]*ruby=env $rvm_ruby_home/bin/ruby=" $actual_file
@@ -623,7 +625,7 @@ function __rvm_inject_ruby_shebang {
   fi ; unset actual_file
 }
 
-function __rvm_inject_gem_env {
+__rvm_inject_gem_env() {
   __rvm_actual_file $1
   if [[ -f "$actual_file" ]] ; then
     if [[ ! -z "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
@@ -639,7 +641,7 @@ function __rvm_inject_gem_env {
   fi ; unset actual_file
 }
 
-function __rvm_actual_file {
+__rvm_actual_file() {
   if [[ -L $1 ]] ; then         # If the file is a symlink,
     actual_file="$(readlink $1)" # read the link target so we can preserve it.
   else

data/scripts/selector

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # __rvm_select implementation version patch_level
-function __rvm_select {
+__rvm_select() {
   if [[ -z "$rvm_ruby_string" ]] ; then
     rvm_ruby_string="${rvm_ruby_interpreter}"
     if [[ ! -z "$rvm_ruby_version" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_version" ; fi
@@ -45,7 +45,7 @@ function __rvm_select {
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-"$(__rvm_db "rubinius_repo_url")"}
       rvm_ruby_string="rbx-head" # for now :)
       rvm_url=$rvm_ruby_repo_url
-      rvm_ruby_configure=""
+      rvm_ruby_configure=" true "
       rvm_ruby_make="build"
       rvm_ruby_make_install=""
     ;;
@@ -153,14 +153,14 @@ function __rvm_select {
 
     rvm_ruby_selected_flag=1
 
-    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
+    export rvm_ruby_interpreter rvm_ruby_version rvm_ruby_repo_url rvm_ruby_package_name rvm_url rvm_ruby_patch_level rvm_ruby_configure rvm_ruby_configure_flags rvm_ruby_make rvm_ruby_make_install rvm_ruby_revision rvm_ruby_tag rvm_major_version rvm_minor_version rvm_gem_set_name rvm_gem_path rvm_ruby_gem_home rvm_path rvm_src_path rvm_bin_path rvm_ruby_binary rvm_ruby_home rvm_log_path rvm_ruby_log_path rvm_src_path rvm_ruby_src_path rvm_ruby_irbrc rvm_ruby_selected_flag rvm_ruby_string
   else
     __rvm_unset_ruby_variables
     rvm_ruby_interpreter="system"
   fi
 }
 
-function __rvm_use {
+__rvm_use() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="default" ; fi
 
@@ -342,6 +342,7 @@ __rvm_ruby_string() {
     patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
     if [[ ! -z "$patch_level" ]] ; then rvm_ruby_patch_level="p${patch_level}" ; fi
     if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
+      rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
     fi
   fi

data/scripts/utility

@@ -33,7 +33,7 @@ Info
   unset full_version
 }
 
-function __rvm_debug {
+__rvm_debug() {
   __rvm_log "debug" "PATH:\n$(echo $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}')"
   __rvm_log "debug" "uname -a: $(uname -a)"
 
@@ -68,7 +68,7 @@ function __rvm_debug {
 
 # Logging functions based on level
 # TODO: Allow specification of a base file name to output to.
-function __rvm_log {
+__rvm_log() {
   if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
   message=$1
   case "$level" in
@@ -92,19 +92,19 @@ __rvm_push() {
   unset array item
 }
 
-function __rvm_clean_path {
+__rvm_clean_path() {
   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 {
+__rvm_remove_rvm_from_path() {
   PATH=$(echo $PATH | tr -s ':' '\n' | grep -v "\.rvm" | tr -s '\n' ':' | sed 's#:$##')
   export PATH
 }
 
-function __rvm_gi { gem install -q --no-rdoc --no-ri $* ; }
+__rvm_gi() { gem install -q --no-rdoc --no-ri $* ; }
 
-function __rvm_run {
+__rvm_run() {
   log_file_name="$1" ; command="$2" ; message="$3"
   rvm_ruby_log_path="${rvm_ruby_log_path:-$rvm_path/log}"
   mkdir -p $(dirname "$rvm_ruby_log_path/$log_file_name.log")
@@ -124,19 +124,19 @@ function __rvm_run {
 
 __rvm_cleanup_variables() {
   __rvm_unset_ruby_variables
-  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path 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_log_path rvm_file_name rvm_ruby_configure rvm_benchmark_flag
+  unset rvm_ruby_selected_flag rvm_action rvm_irbrc_file rvm_src_path rvm_path rvm_prefix_path rvm_gem_path rvm_command rvm_error_message rvm_gem_set_name rvm_url rvm_config_path rvm_bin_path 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_log_path rvm_file_name rvm_benchmark_flag
 }
 
 __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
+  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_flags rvm_ruby_configure
 }
 
 # TODO: root user loadng of /etc/rvmrc
-function __rvm_load_rvmrc {
+__rvm_load_rvmrc() {
   if [[ -s ~/.rvmrc ]] ; then source ~/.rvmrc ; fi
 }
 
-function __rvm_bin_scripts {
+__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)
@@ -146,7 +146,7 @@ function __rvm_bin_scripts {
   done
 }
 
-function __rvm_bin_script {
+__rvm_bin_script() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
@@ -165,7 +165,7 @@ RubyWrapper
   chmod +x $rvm_path/bin/$rvm_ruby_package_name
 }
 
-function __rvm_fetch {
+__rvm_fetch() {
   __rvm_pushpop $rvm_archives_path
   if [[ -z "$1" ]] ; then log "fail" "BUG: __rvm_fetch called without an argument :/" ; return 1 ; fi
   archive=$(basename "$1") ; downlaod=1
@@ -221,7 +221,7 @@ function __rvm_fetch {
   return $result
 }
 
-function __rvm_load_defaults {
+__rvm_load_defaults() {
   if [[ ! -s "$rvm_path/system" ]] ; then
     for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME ; do
       eval value=\$${variable}
@@ -258,7 +258,7 @@ function __rvm_load_defaults {
   fi
 }
 
-function __rvm_reset {
+__rvm_reset() {
   PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
   PATH=$rvm_bin_path:$PATH ; export PATH
 
@@ -277,7 +277,7 @@ function __rvm_reset {
   rm -f $rvm_path/bin/ruby $rvm_path/bin/gem $rvm_path/bin/rake $rvm_path/bin/irb $rvm_path/bin/default*
 }
 
-function __rvm_implode {
+__rvm_implode() {
   while : ; do
     __rvm_log "warn" "Are you SURE you wish for rvm to implode? This will remove $rvm_path ? (type 'yes' or 'no')"
     read response
@@ -301,7 +301,7 @@ function __rvm_implode {
   done
 }
 
-function __rvm_gemdir {
+__rvm_gemdir() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   if [[ ! -z "$GEM_HOME" ]] ; then
     echo "$GEM_HOME"
@@ -310,7 +310,7 @@ function __rvm_gemdir {
   fi
 }
 
-function __rvm_source_dir {
+__rvm_source_dir() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   if [[ -z "$rvm_ruby_src_path" ]] ; then
     __rvm_log "fail" "No source directory exists for the default implementation."
@@ -321,7 +321,7 @@ function __rvm_source_dir {
 
 # clones from source implementation/version to default
 # TODO: Merge this into 'rvm sync'
-function __rvm_gemdup {
+__rvm_gemdup() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   __rvm_log "debug" "$rvm_ruby_interpreter"
   if [[ "default" = "$rvm_ruby_interpreter" ]] ; then
@@ -338,7 +338,7 @@ function __rvm_gemdup {
   __rvm_gem_sync
 }
 
-function __rvm_gem_sync {
+__rvm_gem_sync() {
   if [[ ! -z "$rvm_source_gem_path" ]] ; then
     for rvm_gem_name_version in $rvm_source_gem_path/gems/* ; do
       rvm_gem_name="${rvm_gem_name_version%-*}"
@@ -491,7 +491,7 @@ __rvm_list() {
   fi
 }
 
-function __rvm_initialize {
+__rvm_initialize() {
   rvm_fetch=$(which curl)
   if [[ $? -ne 0 ]] ; then
     __rvm_log "fail" "rvm requires curl, which does not seem to exist in your path :("
@@ -665,7 +665,7 @@ __rvm_do() {
   return ${#errors[*]}
 }
 
-function __rvm_summary {
+__rvm_summary() {
   export successes errors statuses
   summary="\nSummary:\n\n"
   if [[ ${#successes[*]} -gt 0 ]] ; then
@@ -680,7 +680,7 @@ function __rvm_summary {
   return ${#errors[*]}
 }
 
-function __rvm_yaml {
+__rvm_yaml() {
   export successes errors statuses
   yaml="totals:\n  rubies: ${#rubies[*]}\n  successes: ${#successes[*]}\n  errors: ${#errors[*]}\nsuccesses:"
   for var in ${successes[*]} ; do yaml="$yaml\n  - $var" ; done
@@ -699,7 +699,7 @@ function __rvm_yaml {
   return ${#errors[*]}
 }
 
-function __rvm_json {
+__rvm_json() {
   json="{"
   json="$json\n  \"totals\": { \"rubies\": ${#rubies[*]}, \"successes\": ${#successes[*]}, \"errors\": ${#errors[*]}},"
   json="$json\n  \"successful\": [ "$(echo ${successes[*]} | sed 's# #", "#g')" ],"
@@ -721,7 +721,7 @@ function __rvm_json {
   return ${#errors[*]}
 }
 
-function __rvm_benchmark {
+__rvm_benchmark() {
   code="require \"benchmark\" \n Benchmark.bmbm do |benchmark| \n benchmark.report(\"${rvm_ruby_file}\") do \n"
   echo -e "$code" > "$rvm_temp_path/$$.rb"
   unset code
@@ -734,14 +734,14 @@ function __rvm_benchmark {
   __rvm_do
 }
 
-function __rvm_irbrc {
+__rvm_irbrc() {
   # Create the irbrc for the currently selected ruby installation.
   if [[ -d "$rvm_ruby_home" ]] && [[ ! -s "$rvm_ruby_irbrc" ]] ; then
     cp $rvm_path/scripts/irbrc $rvm_ruby_irbrc
   fi
 }
 
-function __rvm_pushpop {
+__rvm_pushpop() {
   if [[ -z "$1" ]] ; then
     popd > /dev/null 2>&1
   else
@@ -749,7 +749,7 @@ function __rvm_pushpop {
   fi
 }
 
-function __rvm_state {
+__rvm_state() {
   if [[ -z "$rvm_state" ]] ; then
     if [[ -z "$(which ruby | awk /$(basename $rvm_path)/)" ]] ; then
       rvm_state=system
@@ -764,7 +764,7 @@ function __rvm_state {
   fi
 }
 
-function __rvm_inspect {
+__rvm_inspect() {
   for binary in $rvm_ruby_args ; do
     actual_file=$(which $binary)
     __rvm_log "info" "$actual_file:"
@@ -780,7 +780,7 @@ function __rvm_inspect {
 #
 # ruby supporting libraries:
 #
-function __rvm_readline_install {
+__rvm_readline_install() {
   __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="readline" ; version="5.2" ; archive_format="tar.gz"
@@ -803,7 +803,7 @@ function __rvm_readline_install {
   __rvm_pushpop
 }
 
-function __rvm_iconv_install {
+__rvm_iconv_install() {
   __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
@@ -817,7 +817,7 @@ function __rvm_iconv_install {
   __rvm_pushpop
 }
 
-function __rvm_openssl_install {
+__rvm_openssl_install() {
   __rvm_make_flags
     if match "$rvm_archflags" "x86_64" ; then
       openssl_os="os/compiler darwin64-x86_64-cc"
@@ -836,7 +836,7 @@ function __rvm_openssl_install {
   __rvm_pushpop
 }
 
-function __rvm_zlib_install {
+__rvm_zlib_install() {
   __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
@@ -850,7 +850,7 @@ function __rvm_zlib_install {
   __rvm_pushpop
 }
 
-function __rvm_ncurses_install {
+__rvm_ncurses_install() {
   __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
@@ -875,9 +875,9 @@ __rvm_make_flags() {
     fi
 
     if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
-      rvm_ruby_configure="${rvm_ruby_configure} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
+      rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
     elif [[ "-arch i386" = "$rvm_archflags" ]] ; then
-      rvm_ruby_configure="${rvm_ruby_configure} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
+      rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
     fi
 
     if [[ -z "$rvm_sdk" ]] ; then

metadata

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