rvm 0.0.96 → 0.0.97

data/binscripts/rvm-prompt

@@ -10,7 +10,7 @@ add(){
   fi
 }
 
-if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
+if which ruby 2>/dev/null | grep -q 'rvm' ; then
   unset format
   while [[ $# -gt 0 ]] ; do
     token="$1" ; shift
@@ -31,18 +31,11 @@ if [[ ! -z "$(which ruby 2>/dev/null | awk '/rvm/{print}')" ]] ; then
   fi
 
   ruby_string=$(dirname "$(which ruby 2>/dev/null)" | xargs dirname | xargs basename)
-  if [[ ! -z "$interpreter_flag" ]] ; then
-    interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
-  fi
-  if [[ ! -z "$version_flag" ]] ; then
-    version="$(echo $ruby_string | awk -F'-' '{print $2}')"
-  fi
-  if [[ ! -z "$patchlevel_flag" ]] ; then
-    patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
-  fi
-  if [[ ! -z "$architecture_flag" ]] ; then
-    architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
-  fi
+
+  (( $interpreter_flag ))  && interpreter="$(echo $ruby_string | awk -F'-' '{print $1}')"
+  (( $version_flag ))      && version="$(echo $ruby_string | awk -F'-' '{print $2}')"
+  (( $patchlevel_flag ))   && patchlevel=$(echo $ruby_string | awk -F'-' '{print $3}')
+  (( $architecture_flag )) && architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
 
   command="prompt=\"[$format]\""
   eval "$command"

data/install

@@ -66,11 +66,15 @@ echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-
-    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
-    if [[ $? -gt 0 ]] ; then
+    if [[ -s "$HOME/.profile" ]] ; then
+      if ! grep -q '.profile' "$rcfile" ; then
+        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+      fi
+    fi
+    if ! grep -q "scripts\/rvm" "$rcfile" ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
     fi
   done
 fi

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 96
+:patch: 97

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.96"
+  s.version = "0.0.97"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

data/scripts/cli

@@ -12,7 +12,7 @@ __rvm_version() { __rvm_meta ; echo "rvm ${rvm_meta_version} by ${rvm_meta_autho
 __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
 
 __rvm_parse_args() {
-  if [[ ! -z "$(echo "$*" | awk '/trace/')" ]] ; then echo "$*" ; fi
+  if echo "$*" | grep -q 'trace' ; then echo "$*" ; fi
 
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
@@ -307,7 +307,7 @@ __rvm_parse_args() {
           elif $rvm_scripts_path/match "$rvm_token" "^[0-9].[0-9]" ; then
             rvm_ruby_string="$rvm_token"
             rvm_action="${rvm_action:-use}"
-          elif $rvm_scripts_path/match "$rvm_token" "^ree" ; then
+          elif $rvm_scripts_path/match "$rvm_token" "^ree-" ; then
             rvm_ruby_string="$rvm_token"
             rvm_action="${rvm_action:-use}"
           else
@@ -389,7 +389,7 @@ rvm() {
       $rvm_scripts_path/monitor ; result=$?
     ;;
     notes)         $rvm_scripts_path/notes   ; result=$?  ;;
-    reload)        rvm_reload_flag=1                      ;;
+    reload)        unset rvm_loaded_flag ; rvm_reload_flag=1                      ;;
     fetch|install|uninstall|remove)
       if [[ ! -z "$rvm_ruby_string" ]] ; then
         $rvm_scripts_path/manage "$rvm_action" "$rvm_ruby_string"

data/scripts/fetch

@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 
-fetch_command=$(which curl 2>/dev/null)
-if [[ $? -ne 0 ]] ; then
+if ! which curl &> /dev/null; then
   $rvm_scripts_path/log "fail" "rvm requires curl, which does not seem to exist in your path :("
   exit 1
 else
-  fetch_command="$fetch_command -O -L --create-dirs -C - " # -s for silent
+  fetch_command="curl -O -L --create-dirs -C - " # -s for silent
 fi
 
 pushd "$rvm_archives_path" > /dev/null 2>&1

data/scripts/gems

@@ -1,19 +1,16 @@
 #!/usr/bin/env bash
 
-#source $rvm_path/scripts/rvm
 source $rvm_path/scripts/utility
-#source $rvm_path/scripts/selector
 
 color_green=$($rvm_scripts_path/color "green")
 color_red=$($rvm_scripts_path/color "red")
 color_yellow=$($rvm_scripts_path/color "yellow")
 color_none=$($rvm_scripts_path/color "none")
 
-if [[ -z "$rvm_ruby_gem_home" ]] ; then rvm_ruby_gem_home="$(gem env home)" ; fi
-if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
-
-trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+if [[ -d "$rvm_ruby_gem_home" ]] && which gem &> /dev/null ; then rvm_ruby_gem_home="$(gem env home)" ; fi
 
+trap "if [[ -d $rvm_path/tmp/ ]] && [[ -f $rvm_path/tmp/$$ ]] ; then rm -f $rvm_path/tmp/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
 
 __rvm_gems_name() {
   echo "$rvm_gem_set_name"
@@ -117,46 +114,49 @@ __rvm_gems_load() {
 
     while read -r line
     do # Keep this on 2nd line :(
-      #
-      # Parse the line
-      #
-      gem="$(echo $line | awk -F';' '{print $1}')"
-      gem_prefix="$(echo $line | awk -F';' '{print $2}')"
-      if $rvm_scripts_path/match "$gem" "\.gem$" ; then
-        gem_name="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{$NF=NULL;print}')"
-        gem_version="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{print $NF}' )"
-        gem_postfix="$(basename $gem | sed "s#.*\.gem##")"
-      else
-        gem_name="$(echo $gem | awk '{print $1}')"
-        if $rvm_scripts_path/match "$gem" "--version" ; then
-          gem_version="$(echo $gem | sed 's#.*--version[=]*[ ]*##' | awk '{print $1}')"
-          gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#--version[=]*[ ]*${gem_version/ /}##")"
-        elif $rvm_scripts_path/match "$gem" "-v" ; then
-          gem_version="$(echo $gem | sed 's#.*-v[=]*[ ]*##' | awk '{print $1}')"
-          gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#-v[=]*[ ]*${gem_version/ /}##")"
-        else
-          unset gem_version # no version
-        fi
-      fi
-
-      if [[ -f "$gem" ]] ; then
-        gem_file_name="$gem"
-      elif $rvm_scripts_path/match "$gem" ".gem$" ; then
-        gem_file_name="$gem"
-      elif [[ -z "${gem_version/ /}" ]] ; then # no v/Users/wayne/projects/db0/rvm/scripts/gems
-        gem_file_name="${gem_name/ /}*.gem"
-      else # version
-        gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
-      fi
+      __rvm_parse_gem_line $line
       __rvm_gem_install
     done < <(awk '/^[\.\/a-zA-Z]/{print}' "$rvm_file_name")
   else
     $rvm_scripts_path/log "error" "$rvm_file_name does not exist to load from."
   fi
 }
+
+__rvm_parse_gem_line() {
+  line="$*"
+  gem="$(echo $line | awk -F';' '{print $1}')"
+  gem_prefix="$(echo $line | awk -F';' '{print $2}')"
+  if $rvm_scripts_path/match "$gem" "\.gem$" ; then
+    gem_name="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{$NF=NULL;print}')"
+    gem_version="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{print $NF}' )"
+    gem_postfix="$(basename $gem | sed "s#.*\.gem##")"
+  else
+    gem_name="$(echo $gem | awk '{print $1}')"
+    if $rvm_scripts_path/match "$gem" "--version" ; then
+      gem_version="$(echo $gem | sed 's#.*--version[=]*[ ]*##' | awk '{print $1}')"
+      gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#--version[=]*[ ]*${gem_version/ /}##")"
+    elif $rvm_scripts_path/match "$gem" "-v" ; then
+      gem_version="$(echo $gem | sed 's#.*-v[=]*[ ]*##' | awk '{print $1}')"
+      gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#-v[=]*[ ]*${gem_version/ /}##")"
+    else
+      unset gem_version # no version
+    fi
+  fi
+
+  if [[ -f "$gem" ]] ; then
+    gem_file_name="$gem"
+  elif $rvm_scripts_path/match "$gem" ".gem$" ; then
+    gem_file_name="$gem"
+  elif [[ -z "${gem_version/ /}" ]] ; then # no v/Users/wayne/projects/db0/rvm/scripts/gems
+    gem_file_name="${gem_name/ /}*.gem"
+  else # version
+    gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
+  fi
+}
 __rvm_gem_install() {
+  __rvm_parse_gem_line $*
 
-  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}*spec 2>/dev/null | head -n 1)"
+  installed_gem="$(ls ${rvm_ruby_gem_home}/specifications/${gem_file_name}spec 2>/dev/null | head -n 1)"
   if [[ -z "$rvm_force_flag" ]] && [[ -f "$installed_gem" ]] ; then
     unset gem
     $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$yellow exists, skipping (--force to re-install)"
@@ -204,20 +204,20 @@ __rvm_gem_install() {
 
     $rvm_scripts_path/log "warn" "$gem_name $gem_version is not installed, installing..."
     if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
-      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+      command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
     else
-      command="$gem_prefix gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
+      command="$gem_prefix $rvm_ruby_home/bin/gem install --no-rdoc --no-ri -q $gem $gem_postfix $vars"
     fi
-    if [[ -f "$gem" ]] ; then command="${command} -l" ; fi
-    eval $command > /dev/null 2>&1
+
+    eval $command >> "$rvm_path/log/$rvm_ruby_string/gem.install.log" 2>> "$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
     result=$?
     if [[ $result -eq 0 ]] ; then
-    $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$color_none installed."
+      $rvm_scripts_path/log "info" "$color_green$gem_name $gem_version$color_none installed."
     else
-      $rvm_scripts_path/log "error" "$color_red$gem_name $gem_version$color_none failed to install."
+      $rvm_scripts_path/log "error" "$color_red$gem_name $gem_version$color_none failed to install, output logged to $rvm_path/log/$rvm_ruby_string/gem.install.error.log"
     fi
-  fi
-  unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
+  fi ; unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
+  return $result
 }
 
 __rvm_gems_gemdir() {
@@ -260,8 +260,7 @@ elif [[ "list" = "$action" ]] ; then
 elif [[ "gemdir" = "$action" ]] ; then
   __rvm_gems_gemdir
 elif [[ "install" = "$action" ]] ; then
-  gem_file_name="$1"
-  __rvm_gem_install
+  __rvm_gem_install $*
 else
   $rvm_scripts_path/log "error" "gems must be passed an action as the first parameter {load,dump,delete,name,list,gemdir,install}"
 fi

data/scripts/install

@@ -66,11 +66,15 @@ echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-
-    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
-    if [[ $? -gt 0 ]] ; then
+    if [[ -s "$HOME/.profile" ]] ; then
+      if ! grep -q '.profile' "$rcfile" ; then
+        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+      fi
+    fi
+    if ! grep -q "scripts\/rvm" "$rcfile" ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
     fi
   done
 fi

data/scripts/libraries

@@ -4,15 +4,14 @@
 # ruby supporting libraries:
 #
 __rvm_readline_install() {
-  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+  (( $rvm_make_flags_flag )) && __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
   #ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz
   for version in 5.2 6.0 ; do
     $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-    $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format"
-    result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+    $rvm_scripts_path/fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.$archive_format" || (result=$? && return $result)
     __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
     builtin cd "$rvm_src_path/$package-$version"
     if [[ "Darwin" = "$(uname)" ]] ; then
@@ -31,18 +30,17 @@ __rvm_readline_install() {
       __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"
     fi
-
   done
   __rvm_pushpop
 }
 
 __rvm_iconv_install() {
-  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+  (( $rvm_make_flags_flag )) && __rvm_make_flags
+  __rvm_pushpop $rvm_src_path
   __rvm_pushpop $rvm_src_path
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  $rvm_scripts_path/fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.$archive_format" || (result=$? && return $result)
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
@@ -52,17 +50,15 @@ __rvm_iconv_install() {
     __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"
   fi
-
   __rvm_pushpop
 }
 
 __rvm_curl_install() {
-  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+  (( $rvm_make_flags_flag )) && __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://curl.haxx.se/download/$package-$version.$archive_format"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  $rvm_scripts_path/fetch "http://curl.haxx.se/download/$package-$version.$archive_format" || (result=$? && return $result)
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
@@ -72,12 +68,11 @@ __rvm_curl_install() {
     __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"
   fi
-
   __rvm_pushpop
 }
 
 __rvm_openssl_install() {
-  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+  (( $rvm_make_flags_flag )) && __rvm_make_flags
   if $rvm_scripts_path/match "$rvm_archflags" "x86_64" ; then
     openssl_os="os/compiler darwin64-x86_64-cc"
   else
@@ -86,8 +81,7 @@ __rvm_openssl_install() {
   __rvm_pushpop $rvm_src_path
   package="openssl" ; version="0.9.8k" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://www.openssl.org/source/$package-$version.tar.gz"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  $rvm_scripts_path/fetch "http://www.openssl.org/source/$package-$version.tar.gz" || (result=$? && return $result)
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/config" "./config --prefix=$rvm_path/usr zlib no-asm no-krb5 shared" "Configuring $package."
@@ -97,17 +91,15 @@ __rvm_openssl_install() {
     __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"
   fi
-
   __rvm_pushpop
 }
 
 __rvm_zlib_install() {
-  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+  (( $rvm_make_flags_flag )) && __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="zlib" ; version="1.2.3" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package-$version.$archive_format"
-  $rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  $rvm_scripts_path/fetch "http://www.zlib.net/$package-$version.tar.gz" || (result=$? && return $result)
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format"
   builtin cd "$rvm_src_path/$package-$version"
   __rvm_run "$package/configure" "./configure --prefix=$rvm_path/usr" "Configuring $package."
@@ -117,17 +109,15 @@ __rvm_zlib_install() {
     __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"
   fi
-
   __rvm_pushpop
 }
 
 __rvm_ncurses_install() {
-  if [[ "rvm_make_flags_flag" -eq 1 ]] ; then __rvm_make_flags ; fi
+  (( $rvm_make_flags_flag )) && __rvm_make_flags
   __rvm_pushpop $rvm_src_path
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   $rvm_scripts_path/log "info" "Retrieving $package"
-  $rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz"
-  result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+  $rvm_scripts_path/fetch "ftp://invisible-island.net/ncurses/ncurses.tar.gz" || (result=$? && return $result)
   __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package.$archive_format -C $rvm_src_path" "Extracting $package.$archive_format"
   builtin 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."
@@ -141,6 +131,7 @@ __rvm_ncurses_install() {
 }
 
 __rvm_install_llvm() {
+  (( $rvm_make_flags_flag )) && __rvm_make_flags
   builtin cd "$rvm_src_path"
   if [[ ! -d "$rvm_src_path/llvm/.svn" ]] ; then
     rm -rf "$rvm_src_path/llvm"
@@ -151,4 +142,3 @@ __rvm_install_llvm() {
     sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make install
   fi
 }
-

data/scripts/manage

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
 original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
@@ -10,26 +10,25 @@ source $rvm_scripts_path/rvm
 trap "rm -f $rvm_path/tmp/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 __rvm_install_source() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
   $rvm_scripts_path/log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p "$rvm_ruby_log_path"
   __rvm_pushpop "$rvm_src_path"
   if [[ ! -z "$rvm_force_flag" ]] ; then rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path" ; fi
 
   result=0
-  __rvm_fetch_ruby
-  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+  __rvm_fetch_ruby || (result=$? && return $result)
 
-  builtin cd $rvm_ruby_src_path
-  if [[ $? -gt 0 ]] ; then result=$? ; $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
+  builtin cd $rvm_ruby_src_path || (result=$? ; $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result)
 
   if [[ -d "${rvm_path}/usr/bin" ]] ; then export PATH="${rvm_path}/usr/bin:${PATH}" ; fi
 
   if [[ -z "$rvm_ruby_configure" ]] && [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
-    rvm_autoconf="$(which autoconf 2>/dev/null)"
-    if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
-    __rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
-    # if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
+    if which autoconf &> /dev/null ; then
+      __rvm_run "autoconf" "autoconf" "Running autoconf"
+    else
+      $rvm_scripts_path/log "fail" "rvm expects autoconf"  result=$? ; return $result
+    fi
   fi
 
   if [[ "1.8.5" = "$rvm_ruby_version" ]] ; then
@@ -45,11 +44,9 @@ __rvm_install_source() {
   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
-    __rvm_run "configure" "$rvm_ruby_configure"
-    if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+    __rvm_run "configure" "$rvm_ruby_configure" || (result=$? && return $result)
   elif [[ -s ./configure ]] ; then
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
-    if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..." || (result=$? && return $result)
     unset configure_parameters
   else
     $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
@@ -62,12 +59,10 @@ __rvm_install_source() {
   fi
 
   rvm_ruby_make=${rvm_ruby_make:-"make"}
-  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
-  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..." || (result=$? && return $result)
 
   rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
-  __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
-  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+  __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string" || (result=$? && return $result)
 
   $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
@@ -83,8 +78,9 @@ __rvm_install_source() {
 
 __rvm_install_ruby() {
 
-  if [[ -z "$rvm_ruby_selected_flag" ]]  ; then __rvm_select $* ; fi
-  if [[ ! -z "$RUBYOPT" ]]     ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
+  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
+
+  if [[ ! -z "$RUBYOPT" ]] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
 
   case "$rvm_ruby_interpreter" in
     macruby)
@@ -104,8 +100,7 @@ __rvm_install_ruby() {
           # TODO: Separated nightly from head.
           __rvm_db "macruby_nightly_url" "rvm_url"
           $rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..."
-          $rvm_scripts_path/fetch "$rvm_url"
-          result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+          $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
           mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$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"
@@ -148,11 +143,9 @@ RubyWrapper
           $rvm_scripts_path/log "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)."
         else
           $rvm_scripts_path/log "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
-          $rvm_scripts_path/fetch "$rvm_url"
-          result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+          $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
           rm -rf "$rvm_ruby_src_path"
-          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file..."
-          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+          __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file..." || (result=$? && return $result)
           mv "$rvm_src_path/$rvm_ruby_package_file" "$rvm_ruby_src_path"
         fi
         builtin cd "$rvm_ruby_src_path"
@@ -167,8 +160,7 @@ RubyWrapper
           rvm_ree_options="${rvm_ree_options} --no-tcmalloc"
         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
+        __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)..." || (result=$? && return $result)
         chmod +x $rvm_ruby_home/bin/*
 
         __rvm_rubygems_setup
@@ -211,11 +203,9 @@ RubyWrapper
       if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
         if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_file.tar.gz" ]] ; then
           $rvm_scripts_path/log "info" "Downloading $rvm_ruby_file, this may take a while depending on your connection..."
-          $rvm_scripts_path/fetch "$rvm_url"
-          result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+          $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
         fi
-        __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_file.tar.gz ..."
-        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+        __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_file.tar.gz ..." || (result=$? && return $result)
         mv $rvm_src_path/rubinius-$rvm_ruby_version $rvm_ruby_src_path
       else
         __rvm_db "rubinius_repo_url" "rvm_ruby_repo_url"
@@ -306,21 +296,17 @@ RubyWrapper
     ;;
 
     jruby)
-      if [[ -z "$(which java 2>/dev/null)" ]] ; then
+      if ! which java &> /dev/null ; then
         echo -e "java must be installed and in your path in order to install JRuby." ; return 1
       fi
 
       mkdir -p "$rvm_ruby_log_path"  "$rvm_ruby_src_path"
       __rvm_pushpop $rvm_src_path
-
-      __rvm_fetch_ruby
-      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
-
-      __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
-      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+      __rvm_fetch_ruby || (result=$? && return $result)
+      (( $rvm_head_flag )) || __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
 
       builtin cd "$rvm_ruby_src_path"
-      if [[ "$rvm_head_flag" -eq 1 ]] || [[ ! -z "$rvm_ruby_revision" ]] ; then ant dist ; fi
+      (( $rvm_head_flag )) && (( $rvm_ruby_version )) && ant dist
 
       mkdir -p "$rvm_ruby_home/bin/"
       __rvm_run "nailgun" "builtin cd "$rvm_ruby_src_path/tool/nailgun" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags"
@@ -352,13 +338,12 @@ RubyWrapper
     ;;
 
     ironruby|ir)
-      if [[ -z "$(which mono 2>/dev/null)" ]] ; then
+      if ! which mono &> /dev/null ; then
         echo -e "mono must be installed and in your path in order to install IronRuby." ; return 1
       fi
 
       $rvm_scripts_path/log "info" "Retrieving IronRuby"
-      $rvm_scripts_path/fetch "$rvm_url"
-      result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+      $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
 
       __rvm_run "extract" "unzip $rvm_archives_path/$rvm_ruby_package_file ironruby/bin/* ironruby/lib/* -d $rvm_ruby_home" "Extracting $rvm_ruby_package_file ..."
       mv $rvm_ruby_home/ironruby/* $rvm_ruby_home
@@ -415,10 +400,11 @@ RubyWrapper
       fi
 
       if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
-          rvm_autoconf="$(which autoconf 2>/dev/null)"
-          if [[ $? -gt 0 ]] ; then $rvm_scripts_path/log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
-          __rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
-          # if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
+        if which autoconf &> /dev/null ; then
+          __rvm_run "autoconf" "autoconf" "Running autoconf"
+        else
+          $rvm_scripts_path/log "fail" "rvm expects autoconf" ; result=$? ; return $result
+        fi
       fi
 
       if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
@@ -426,20 +412,17 @@ RubyWrapper
       elif [[ ! -z "rvm_ruby_configure" ]] ; then
           $rvm_ruby_configure
       elif [[ -s ./configure ]] ; then
-          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..."
-          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+          __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string using $rvm_ruby_configure_flags, this may take a while depending on your cpu(s)..." || (result=$? && return $result)
           unset configure_parameters
       else
           $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
       fi
 
       rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
-      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..."
-      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+      __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_string, this may take a while, depending on your cpu(s)..." || (result=$? && return $result)
 
       rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
-      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string"
-      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+      __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_string" || (result=$? && return $result)
 
       $rvm_scripts_path/log "info" "Installation of $rvm_ruby_string is complete."
 
@@ -470,7 +453,7 @@ RubyWrapper
 }
 
 __rvm_fetch_ruby() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
 
   if [[ -z "$rvm_head_flag" ]] && [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
     rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_string"}"
@@ -487,31 +470,26 @@ __rvm_fetch_ruby() {
         rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_url")/$rvm_ruby_package_file.$rvm_archive_extension"
       fi
       $rvm_scripts_path/log "info" "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
-      $rvm_scripts_path/fetch "$rvm_url"
-      result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+      $rvm_scripts_path/fetch "$rvm_url" || (result=$? && return $result)
     fi
-    __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..."
-    if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+    __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension -C $rvm_src_path" "Extracting $rvm_ruby_package_file ..." || (result=$? && return $result)
   else
     if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
       if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
         builtin cd $rvm_ruby_src_path
         if [[ -z "$rvm_ruby_revision" ]] ; then
           $rvm_scripts_path/log "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-          git pull origin master
-          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+          git pull origin master || (result=$? && return $result)
         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 || (result=$? && return $result)
         fi
       else
         $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
-        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
-        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+        git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path || (result=$? && return $result)
       fi
     else
       if [[ ! -z "$rvm_head_flag" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
@@ -537,14 +515,13 @@ __rvm_fetch_ruby() {
       else
         rm -rf $rvm_ruby_src_path
         __rvm_run "svn.checkout" "svn checkout -q ${rvm_rev/-r/-r } $rvm_url $rvm_ruby_src_path"
-      fi
-      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
+      fi || (result=$? && return $result)
     fi
   fi
 }
 
 __rvm_uninstall_ruby() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
 
   if [[ ! -z "$rvm_ruby_string" ]] ; then
     for dir in $rvm_path ; do
@@ -561,11 +538,11 @@ __rvm_uninstall_ruby() {
     rm -rf $rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version*/
   else
     $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
-  fi
+  fi ; unset rvm_uninstall_flag
 }
 
 __rvm_remove_ruby() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+  (( $rvm_ruby_selected_flag )) ||  __rvm_select $*
 
   if [[ ! -z "$rvm_ruby_string" ]] ; then
     for dir in $rvm_src_path $rvm_path ; do
@@ -581,7 +558,7 @@ __rvm_remove_ruby() {
     done ; unset dir
   else
     $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
-  fi
+  fi ; unset rvm_remove_flag
 }
 
 __rvm_post_install() {
@@ -638,8 +615,7 @@ __rvm_rubygems_setup() {
     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_scripts_path/log "info" "Retrieving $rvm_gem_package_name"
-      $rvm_scripts_path/fetch "$rvm_gem_url"
-      result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi
+      $rvm_scripts_path/fetch "$rvm_gem_url" || (result=$? && return $result)
       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
@@ -682,7 +658,7 @@ __rvm_inject_gem_env() {
 }
 
 __rvm_actual_file() {
-  if [[ -L $1 ]] ; then         # If the file is a symlink,
+  if [[ -L $1 ]] ; then          # If the file is a symlink,
     actual_file="$(readlink $1)" # read the link target so we can preserve it.
   else
     actual_file="$1"
@@ -690,9 +666,10 @@ __rvm_actual_file() {
 }
 
 __rvm_manage_rubies() {
-  #__rvm_state
   rubies=() ; successes=() ; errors=() ; statuses=()
+
   unset rvm_gem_set_name rvm_ruby_selected_flag
+
   rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F'%' '{print $1}')
   rvm_ruby_string=$(echo $rvm_ruby_string | awk -F'%' '{print $1}')
 
@@ -725,11 +702,10 @@ __rvm_manage_rubies() {
       $rvm_scripts_path/log "warn" 'Really? Install all? See "rvm list --all" and limit the selection to something more sane please :)'
     fi
   fi
-  #__rvm_state
 
-  if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
-  if [[ ! -z "$rvm_yaml_flag" ]]   ; then __rvm_yaml    ; fi
-  if [[ ! -z "$rvm_json_flag" ]]   ; then __rvm_json    ; fi
+  (( $rvm_summary_flag )) && __rvm_summary
+  (( $rvm_yaml_flag ))    && __rvm_yaml
+  (( $rvm_json_flag ))    && __rvm_json
 }
 
 rvm_action="$1" ; rubies_string="$2"

data/scripts/match

@@ -8,7 +8,7 @@ if [[ ! -z "$BASH_VERSION" ]] && [[ ${BASH_VERSION:0:1} -gt 2 ]] ; then
   [[ "$1" =~ $2 ]]
   exit $?
 else
-  if [ ! -z "$(echo "$1" | awk "/${2}/")" ] ; then
+  if echo "$1" | grep -q "${2}" ; then
     exit 0
   else
     exit 1

data/scripts/rvm

@@ -37,7 +37,11 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
 
     alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
-    if [[ -s "$rvm_path/default" ]] ; then source "$rvm_path/default" ; fi
+    if [[ -s "$HOME/.rvm/default" ]] ; then
+      source "$HOME/.rvm/default"
+    elif [[ -s "$rvm_path/default" ]] ; then
+      source "$rvm_path/default"
+    fi
   else
     echo -e "\$rvm_path is not set. rvm cannot load."
   fi

data/scripts/rvm-install

@@ -66,11 +66,15 @@ echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-
-    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
-    if [[ $? -gt 0 ]] ; then
+    if [[ -s "$HOME/.profile" ]] ; then
+      if ! grep -q '.profile' "$rcfile" ; then
+        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+      fi
+    fi
+    if ! grep -q "scripts\/rvm" "$rcfile" ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
     fi
   done
 fi

data/scripts/selector

@@ -360,10 +360,11 @@ __rvm_ruby_string() {
     elif $rvm_scripts_path/match "$string" "^u[a-z0-9]" ; then
       unset rvm_ruby_patch_level rvm_ruby_revision rvm_ruby_tag rvm_ruby_patch
       rvm_ruby_user_tag="$string"
-    elif $rvm_scripts_path/match "$string" "^[a-z][a-z]" ; then
+    elif [[ "$string" = "ruby" ]] || [[ "$string" = "jruby" ]] || [[ "$string" = "ree" ]] || [[ "$string" = "macruby" ]] || [[ "$string" = "rbx" ]] || [[ "$string" = "rubinius" ]] || [[ "$string" = "mput" ]] || [[ "$string" = "shyouhei" ]] || [[ "$string" = "ironruby" ]] ; then
       rvm_ruby_interpreter="$string"
     else
       $rvm_scripts_path/log "error" "Unknown ruby string component: '$string'"
+      return 1
     fi
   done
 

data/scripts/update

@@ -66,11 +66,15 @@ echo -e "\n    Checking rc files ($rvm_rc_files) ..."
 if [[ "$rvm_loaded_flag" != "1" ]] ; then
   for rcfile in $(echo $rvm_rc_files) ; do
     if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
-
-    grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
-    if [[ $? -gt 0 ]] ; then
+    if [[ -s "$HOME/.profile" ]] ; then
+      if ! grep -q '.profile' "$rcfile" ; then
+        echo "    Adding 'if [[ -s $HOME/.profile ]] ; then source $HOME ; fi' to $rcfile."
+        echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+      fi
+    fi
+    if ! grep -q "scripts\/rvm" "$rcfile" ; then
       echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
-      echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
+      echo -e "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
     fi
   done
 fi

data/scripts/utility

@@ -71,7 +71,7 @@ __rvm_debug() {
 
   for file_name in $(echo $rc_files) ; do
     if [[ -s "$file_name" ]] ; then
-      $rvm_scripts_path/log "debug" "$file_name:\n$(grep 'rvm' $file_name)"
+      $rvm_scripts_path/log "debug" "$file_name:\n$(grep 'rvm' $file_name 2>/dev/null)"
     fi
   done
 
@@ -117,7 +117,10 @@ __rvm_run() {
   mkdir -p $(dirname "$rvm_ruby_log_path/$log_file_name.log")
 
   if [[ ! -z "$message" ]] ; then $rvm_scripts_path/log "info" "$message" ; fi
-  (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "Executing: $command"
+  if [[ ! -z "$rvm_debug_flag" ]] ; then
+    $rvm_scripts_path/log "debug" "Executing: $command"
+  fi
+
   touch "$rvm_ruby_log_path/$log_file_name.log" "$rvm_ruby_log_path/$log_file_name.error.log" # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee "$rvm_ruby_log_path/$log_file_name.log" > "$rvm_ruby_log_path/$log_file_name.error.log"
   if [[ -z "$rvm_niceness" ]] || [[ "0" = "$rvm_niceness" ]] ; then
@@ -339,8 +342,7 @@ __rvm_initialize() {
 
   __rvm_clean_path
 
-  rvm_result=$(echo $PATH | grep 'rvm\/bin:')
-  if [[ -z "$rvm_result" ]] ; then
+  if echo $PATH | grep -q 'rvm\/bin:' ; then
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
@@ -421,9 +423,7 @@ __rvm_ruby_do() {
   elif [[ -x "$rvm_ruby_gem_home/bin/$binary" ]] ; then
     binary="$rvm_ruby_gem_home/bin/$binary"
   elif [[ "system" = "$rvm_ruby_string" ]] && [[ -x "$(which $binary)" ]] ; then
-    binary="$(which $binary 2>/dev/null)"
-  #elif [[ "spec" = "$binary" ]] ; then
-    #binary="$(which $binary 2>/dev/null)"
+    binary="$(basename $(which $binary 2>/dev/null) 2>/dev/null)"
   else
     $rvm_scripts_path/log "warn" "'$binary not found for $rvm_ruby_string' either does not exist or is not executable? :("
     __rvm_unset_ruby_variables
@@ -435,7 +435,7 @@ __rvm_ruby_do() {
     rvm_ruby_mode="--$(echo $rvm_ruby_mode | sed 's/^m//')"
   fi
 
-  load_path="$rvm_ruby_home/bin:$rvm_ruby_load_path"
+  load_path="$(dirname $(which $binary 2>/dev/null) 2>/dev/null):$rvm_ruby_load_path"
   # TODO: the else case below should be run if $rvm_ruby_args =~ /\.rb$/
   if [[ "ruby" = "$(basename $binary)" ]] && [[ "$rvm_benchmark_flag" -ne 1 ]] ; then
     if $rvm_scripts_path/match "$rvm_ruby_args" "\.rb$" ; then
@@ -458,7 +458,7 @@ __rvm_ruby_do() {
     touch ./log/$rvm_ruby_string/$rvm_action.log ./log/$rvm_ruby_string/$rvm_action.error.log
     eval "$rvm_command" >> ./log/$rvm_ruby_string/$rvm_action.log 2>> ./log/$rvm_ruby_string/$rvm_action.error.log
   else
-    echo -e "\n\n\033[0;32m$rvm_ruby_string: $($rvm_ruby_home/bin/ruby -v $rvm_ruby_mode | tr "\n" ' ')\033[0m\n"
+    echo -e "\n\n\033[0;32m$rvm_ruby_string: $($binary -v $rvm_ruby_mode | tr "\n" ' ')\033[0m\n"
     eval "$rvm_command"
   fi
   result=$?
@@ -533,7 +533,9 @@ __rvm_yaml() {
   total=${#rubies[*]}
   if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    if [[ ! -z "$rvm_debug_flag" ]] ; then
+      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    fi
     yaml="$yaml\n  \"${rubies[$index]}\": ${statuses[$index]}"
   done ; unset index array_start
   mkdir -p log
@@ -552,7 +554,9 @@ __rvm_json() {
   total=${#rubies[*]}
   if [[ ! -z "$ZSH_VERSION" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
-    (( $rvm_debug_flag )) && $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    if [[ ! -z "$rvm_debug_flag" ]] ; then
+      $rvm_scripts_path/log "debug" "${rubies[$index]}: ${statuses[$index]}"
+    fi
     json="$json\n    {\"${rubies[$index]}\": ${statuses[$index]}}"
     if (( $index + 1 < $total + $array_start )) ; then json="$json,  " ; fi
   done ; unset index array_start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.96
+  version: 0.0.97
 platform: ruby
 authors: 
 - Wayne E. Seguin