rvm 0.1.47 → 1.0.0

data/binscripts/rvm

@@ -3,7 +3,7 @@
 if [[ -z "$rvm_ignore_rvmrc" ]]; then
   for rvmrc in /etc/rvmrc "$HOME/.rvmrc" ; do
     if [[ -f "$rvmrc" ]] ; then
-      if grep -q '^\s*rvm .*$' "$rvmrc" ; then
+      if \grep -q '^\s*rvm .*$' "$rvmrc" ; then
         printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
         exit 1
       else
@@ -34,7 +34,7 @@ if [[ -z "$rvm_prefix" ]] ; then
 fi
 
 # Fix rvm_prefix changes.
-echo "$rvm_prefix" | grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
+echo "$rvm_prefix" | \grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
 rvm_prefix_needs_trailing_slash="$?"
 if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
   rvm_prefix="$rvm_prefix/"

data/binscripts/rvm-shell

@@ -11,7 +11,7 @@ __rvm_shell_lookup_script() {
 }
 
 # If the first argument isn't -c, remove it and set it to the ruby string value.
-if [[ -n "$1" && ! -f "$1" && -n "$(echo "$1" | grep -v '^-')" ]]; then
+if [[ -n "$1" && ! -f "$1" && -n "$(echo "$1" | \grep -v '^-')" ]]; then
   rvm_shell_ruby_string="$1"
   shift
 fi

data/config/db

@@ -39,7 +39,7 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
 ree_1.8.7_url=http://rubyforge.org/frs/download.php/71096
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2010.02
-jruby_version=1.5.1
+jruby_version=1.5.2
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
 macruby_version=0.6

data/config/known

@@ -19,7 +19,8 @@ ruby-head
 jruby-1.2.0
 jruby-1.3.1
 jruby-1.4.0
-jruby(-1.5.1)
+jruby-1.5.1
+jruby(-1.5.2)
 jruby-head
 
 # Rubinius

data/config/md5

@@ -28,6 +28,31 @@ ruby-1.9.2-preview3.tar.gz=209e59f3495a5503fa948c2732f1d705
 ruby-1.9.2-rc1.tar.gz=fdedd5b42ae89a9a46797823ad2d9acf
 ruby-1.9.2-rc2.tar.gz=d12cd39eee4d99bc54b52aba5a0ba4e1
 ruby-1.9.2-p0.tar.gz=755aba44607c580fddc25e7c89260460
+ruby-1.8.5-p115.tar.bz2=03955e3c367b9beb3efe144c9f00d689
+ruby-1.8.5-p231.tar.bz2=327f5aa6573787432222e96195cffd1e
+ruby-1.8.6-p286.tar.bz2=e6b6bf8f34370e433936adb7a7065e63
+ruby-1.8.6-p287.tar.bz2=80b5f3db12531d36e6c81fac6d05dda9
+ruby-1.8.6-p369.tar.bz2=c3c1f3dd0dfbd2e17a04e59c2f12cfc8
+ruby-1.8.6-p383.tar.bz2=a48703cd982b9f0e3002700a50b0e88e
+ruby-1.8.6-p398.tar.bz2=fbd43dc44ee26be4d37e6bebbed6f8bd
+ruby-1.8.6-p399.tar.bz2=f77c307cb72fb8808b0e85af5d05cefc
+ruby-1.8.7-p160.tar.bz2=f8ddb886b8a81cf005f53e9a9541091d
+ruby-1.8.7-p174.tar.bz2=88c45aaf627b4404e5e4273cb03ba2ee
+ruby-1.8.7-p248.tar.bz2=37e19d46b7d4b845f57d3389084b94a6
+ruby-1.8.7-p249.tar.bz2=37200cc956a16996bbfd25bb4068f242
+ruby-1.8.7-p299.tar.bz2=244439a87d75ab24170a9c2b451ce351
+ruby-1.8.7-p302.tar.bz2=a6a9e37079ed8cf8726b455dad3de939
+ruby-1.9.1-p129.tar.bz2=6fa62b20f72da471195830dec4eb2013
+ruby-1.9.1-p243.tar.bz2=66d4f8403d13623051091347764881a0
+ruby-1.9.1-p376.tar.bz2=e019ae9c643c5efe91be49e29781fb94
+ruby-1.9.1-p376.tar.bz2=e019ae9c643c5efe91be49e29781fb94
+ruby-1.9.1-p378.tar.bz2=5922459622a23612eb9b68a3586cb5f8
+ruby-1.9.1-p429.tar.bz2=09df32ae51b6337f7a2e3b1909b26213
+ruby-1.9.2-preview1.tar.bz2=0b8f27ea78afcdc54d5d23e569aa0150
+ruby-1.9.2-preview3.tar.bz2=19225dceacaac49ddc1664e593af54ac
+ruby-1.9.2-rc1.tar.bz2=242dcfaed8359a6918941b55d0806bf0
+ruby-1.9.2-rc2.tar.bz2=4e4906d0aab711286b31f5a834860cc3
+ruby-1.9.2-p0.tar.bz2=d8a02cadf57d2571cd4250e248ea7e4b
 ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
 ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
 ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
@@ -43,6 +68,7 @@ jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
 jruby-bin-1.5.0.RC3.tar.gz=9c2758600de903b8ca07cb1341f4f1b3
 jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
 jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
+jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
 ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3

data/contrib/install-system-wide

@@ -30,7 +30,7 @@ rvm_path="${rvm_path:-"/usr/local/rvm"}"
 export rvm_selfcontained=0
 
 rvm_group_name="${rvm_group_name:-"rvm"}"
-if cat /etc/group | cut -d: -f1 | grep -q "^${rvm_group_name}$"; then
+if cat /etc/group | cut -d: -f1 | \grep -q "^${rvm_group_name}$"; then
   echo "Group exists, proceeding with installation."
 else
   echo "Creating the group '$rvm_group_name'"

data/install

@@ -47,7 +47,7 @@ spinner() {
   command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+if echo "$*" | \grep -q 'trace' ; then echo "$*" ; env | \grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -72,7 +72,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
+if \grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || \grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -178,12 +178,12 @@ if [[ -n "$rvm_auto_flag" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
       if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
-        if ! grep -q '.profile' "$rcfile" ; then
+        if ! \grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
           printf "\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
+      if ! \grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
         printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
       fi
@@ -275,7 +275,7 @@ done
 
 # Move from legacy defaults to the new, alias based system.
 if [[ -s "$rvm_config_path/default" ]]; then
-  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
+  original_version="$(basename "$(\grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
   if [[ -n "$original_version" ]]; then
     $rvm_scripts_path/alias create default "$original_version" &> /dev/null
   fi
@@ -335,7 +335,7 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
+  if [[ -s "$HOME/.bashrc" ]] && \grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
     printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
     printf "\n   if [[ -n \"\$PS1\" ]] ; then"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
-:major: 0
-:minor: 1
-:patch: 47
+:major: 1
+:minor: 0
+:patch: 0

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.47"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2010-08-22}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/base

@@ -4,7 +4,7 @@
 # Load the general scripts.
 # Use rvm_base_except="" to override the except.
 for script_name in initialize utility selector; do
-  if echo "$rvm_base_except" | grep -vq "$script_name" ; then
+  if echo "$rvm_base_except" | \grep -vq "$script_name" ; then
     source $rvm_scripts_path/$script_name
   fi
 done; unset script_name rvm_base_except

data/scripts/cli

@@ -23,7 +23,7 @@ __rvm_parse_args() {
   #       Otherwise this file gets big rather fast.
   #echo "$@" >> $HOME/.rvm_history
 
-  if echo "$@" | grep -q 'trace' ; then echo "$@" ; __rvm_version ; fi
+  if echo "$@" | \grep -q 'trace' ; then echo "$@" ; __rvm_version ; fi
 
   while [[ $# -gt 0 ]] ; do
     rvm_token="$1" ; shift
@@ -80,7 +80,7 @@ __rvm_parse_args() {
           rvm_use_flag=1
           rvm_ruby_args="$@" ; shift
           rvm_gemset_name="$1" ; shift
-          if [[ ! -z "$(echo $rvm_gemset_name | grep $rvm_gemset_separator)" ]] ; then
+          if [[ ! -z "$(echo $rvm_gemset_name | \grep $rvm_gemset_separator)" ]] ; then
             rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
             rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
             if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
@@ -92,7 +92,7 @@ __rvm_parse_args() {
           rvm_delete_flag=1
           rvm_ruby_args="$@" ; shift
           rvm_gemset_name="$1"; shift
-          if [[ ! -z "$(echo $rvm_gemset_name | grep $rvm_gemset_separator)" ]] ; then
+          if [[ ! -z "$(echo $rvm_gemset_name | \grep $rvm_gemset_separator)" ]] ; then
             rvm_ruby_string=$(echo $rvm_gemset_name | sed 's/\(.*\)'${rvm_gemset_separator}'.*/\1/')
             rvm_gemset_name=$(echo $rvm_gemset_name | sed 's/.*'${rvm_gemset_separator}'\(.*\)/\1/')
             if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
@@ -139,8 +139,14 @@ __rvm_parse_args() {
       ;;
 
       load-rvmrc)
-        rvm_action="$rvm_token"
-        rvm_ruby_args="$1"
+        rvm_action="rvmrc"
+        rvm_ruby_args="'load' $(__rvm_quote_args "$@")"
+        rvm_parse_break=1
+      ;;
+      
+      rvmrc)
+        rvm_action="rvmrc"
+        rvm_ruby_args="$(__rvm_quote_args "$@")"
         rvm_parse_break=1
       ;;
 
@@ -318,7 +324,7 @@ __rvm_parse_args() {
 
       reboot|damnit|wtf|argh|BOOM|boom|wth) $rvm_action="reboot" ;;
 
-      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--rvmrc|--gems|--docs)
+      --self|--gem|--rubygems|--reconfigure|--default|--debug|--force|--export|--summary|--latest|--yaml|--json|--archive|--shebang|--env|--path|--tail|--delete|--verbose|--import|--rvmrc|--sticky|--create|--gems|--docs)
         export rvm_$(echo $rvm_token | sed 's#-##g')_flag=1
       ;;
 
@@ -545,11 +551,10 @@ rvm() {
       __rvm_run_script "$rvm_action"
       result=$?
     ;;
-
-
-    load-rvmrc)
-      __rvm_project_rvmrc "$rvm_ruby_args"
-      result=$?
+    
+    rvmrc)
+      eval "__rvm_rvmrc_tools $rvm_ruby_args"
+      result="$?"
     ;;
 
     gemset)

data/scripts/completion

@@ -1,6 +1,6 @@
 # bash completion for Ruby Version Manager (RVM)
 
-__rvm_comp() 
+__rvm_comp()
 {
   local cur="${COMP_WORDS[COMP_CWORD]}"
   COMPREPLY=($(compgen -W "$1" -- "$cur"))
@@ -30,7 +30,7 @@ __rvm_rubies ()
 
 __rvm_gemsets ()
 {
-  echo "$(rvm gemset list | grep -v gemset 2>/dev/null)"
+  echo "$(rvm gemset list | \grep -v gemset 2>/dev/null)"
 }
 
 _rvm_commands ()

data/scripts/docs

@@ -48,7 +48,7 @@ generate_rdoc() {
   \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
   $rvm_scripts_path/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
   $rvm_scripts_path/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
-  if gem list | grep -q ^hanna ; then
+  if gem list | \grep -q ^hanna ; then
     hanna -o $rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type --inline-source --line-numbers --fmt=html > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
   else
     rdoc -a -o $rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log

data/scripts/environment-convertor

@@ -30,14 +30,14 @@ contents_of_environment_file() {
 }
 
 convert_to_shell() {
-  convert_path_to_fish "$(contents_of_environment_file | grep '^export PATH=')"
+  convert_path_to_fish "$(contents_of_environment_file | \grep '^export PATH=')"
   while read -r shell_line; do
-    if echo "$shell_line" | grep -q '^unset '; then
+    if echo "$shell_line" | \grep -q '^unset '; then
       echo "$shell_line" | convert_unset_to_fish
     else
       echo "$shell_line" | convert_exports_to_fish
     fi
-  done < <(contents_of_environment_file | grep -v '^export [^=]*$' | grep -v '^export PATH=')
+  done < <(contents_of_environment_file | \grep -v '^export [^=]*$' | \grep -v '^export PATH=')
   unset shell_line
 }
 
@@ -57,4 +57,4 @@ if [[ "$(__rvm_environment_identifier)" != "$environment_name" ]]; then
   __rvm_become "$environment_name" || exit 1
 fi
 
-convert_to_shell
+convert_to_shell

data/scripts/gemsets

@@ -16,7 +16,7 @@ usage() {
 gemset_update() {
   if [[ -z "$rvm_ruby_strings" ]]; then
     $rvm_scripts_path/log "info" "Running gem update for all rubies and gemsets."
-    rvm_ruby_strings="$(\ls "$rvm_gems_path" | grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
+    rvm_ruby_strings="$(\ls "$rvm_gems_path" | \grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
   else
     $rvm_scripts_path/log "info" "Running gem update for the specified rubies."
   fi
@@ -375,7 +375,7 @@ gem_install() {
 # Output the user's current gem directory.
 gemset_info() {
   if [[ "$rvm_user_flag" -eq 1 ]] ; then
-    echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
+    echo $(rvm system ; gem env | \grep "\- $HOME" | awk '{print $NF}')
   elif [[ "$rvm_system_flag" -eq 1 ]] ; then
     echo $(rvm system ; gem env $action system)
   elif [[ ! -z "$rvm_ruby_string" ]] ; then

data/scripts/info

@@ -85,7 +85,7 @@ info_debug() {
 
   for file_name in $(echo $rc_files) ; do
     if [[ -s "$file_name" ]] ; then
-      rvm_info="$rvm_info\n$( "$file_name:\n$(grep 'rvm' $file_name 2>/dev/null)" )"
+      rvm_info="$rvm_info\n$( "$file_name:\n$(\grep 'rvm' $file_name 2>/dev/null)" )"
     fi
   done
 

data/scripts/install

@@ -47,7 +47,7 @@ spinner() {
   command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+if echo "$*" | \grep -q 'trace' ; then echo "$*" ; env | \grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -72,7 +72,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
+if \grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || \grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -178,12 +178,12 @@ if [[ -n "$rvm_auto_flag" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
       if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
-        if ! grep -q '.profile' "$rcfile" ; then
+        if ! \grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
           printf "\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
+      if ! \grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
         printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
       fi
@@ -275,7 +275,7 @@ done
 
 # Move from legacy defaults to the new, alias based system.
 if [[ -s "$rvm_config_path/default" ]]; then
-  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
+  original_version="$(basename "$(\grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
   if [[ -n "$original_version" ]]; then
     $rvm_scripts_path/alias create default "$original_version" &> /dev/null
   fi
@@ -335,7 +335,7 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
+  if [[ -s "$HOME/.bashrc" ]] && \grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
     printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
     printf "\n   if [[ -n \"\$PS1\" ]] ; then"

data/scripts/list

@@ -35,7 +35,7 @@ list_gemsets() {
   done ; unset version
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
-    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
+    version=$(\grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
       string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
@@ -81,7 +81,7 @@ list_strings() {
 # This is meant to be used with scripting.
 list_gemset_strings() {
   local all_rubies="$(list_strings)"
-  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -n1 basename -- | grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
+  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
     local ruby_name="$(echo "$gemset" | awk -F$rvm_gemset_separator '{print $1}')"
     [[ "$all_rubies" != *"$ruby_name"* ]] && continue
     echo "$gemset"
@@ -111,12 +111,12 @@ list_rubies_strings() {
 }
 
 list_rubies() {
-  
+
   if [[ "$1" = "strings" ]]; then
     list_rubies_strings
     return 0
   fi
-  
+
   echo
 
   current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
@@ -140,7 +140,7 @@ list_rubies() {
   done ; unset version
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
-    version=$(grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
+    version=$(\grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
       string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"

data/scripts/maglev

@@ -88,7 +88,7 @@ case "$system" in
   Solaris-x86)
   # TODO: figure memory needs for Solaris-x86
   # Investigate project.max-shm-memory
-  totalMemMB="`/usr/sbin/prtconf | grep Memory | cut -f3 -d' '`"
+  totalMemMB="`/usr/sbin/prtconf | \grep Memory | cut -f3 -d' '`"
   totalMem=$(($totalMemMB * 1048576))
   shmmax=$(($totalMem / 4))
   shmall=$(($shmmax / 4096))
@@ -144,7 +144,7 @@ fi
 
 # At this point, shared memory settings contain the values we want,
 # put them in sysctl.conf so they are preserved.
-if [[ ! -f /etc/sysctl.conf ]] || [[ "$(grep -sc "kern.*.shm" /etc/sysctl.conf)" -eq 0 ]] ; then
+if [[ ! -f /etc/sysctl.conf ]] || [[ "$(\grep -sc "kern.*.shm" /etc/sysctl.conf)" -eq 0 ]] ; then
   case "$system" in
     Linux)
       echo "# kernel.shm* settings added by MagLev installation" > /tmp/sysctl.conf.$$
@@ -177,17 +177,17 @@ if [[ ! -f /etc/sysctl.conf ]] || [[ "$(grep -sc "kern.*.shm" /etc/sysctl.conf)"
 else
   $rvm_scripts_path/log "info" "The following shared memory settings already exist in /etc/sysctl.conf"
   echo "To change them, remove the following lines from /etc/sysctl.conf and rerun this script"
-  grep "kern.*.shm" /etc/sysctl.conf
+  \grep "kern.*.shm" /etc/sysctl.conf
 fi
 
 # Now setup for NetLDI in case we ever need it.
 $rvm_scripts_path/log "info" "Setting up GemStone netldi service port"
-if [[ $(grep -sc "^gs64ldi" /etc/services) -eq 0 ]]; then
+if [[ $(\grep -sc "^gs64ldi" /etc/services) -eq 0 ]]; then
   echo '[[Info]] Adding "gs64ldi  50378/tcp" to /etc/services'
   sudo bash -c 'echo "gs64ldi         50378/tcp        # Gemstone netldi"  >> /etc/services'
 else
   $rvm_scripts_path/log "info" "GemStone netldi service port is already set in /etc/services"
   echo "To change it, remove the following line from /etc/services and rerun this script"
-  grep "^gs64ldi" /etc/services
+  \grep "^gs64ldi" /etc/services
 fi
 

data/scripts/manage

@@ -43,7 +43,7 @@ __rvm_apply_patches() {
   for patch_name in $(__rvm_current_patch_names | __rvm_strip); do
     patch_level="1"
     # If set, extract the patch level from the patch name.
-    if echo "$patch_name" | grep -q "$patch_level_seperator"; then
+    if echo "$patch_name" | \grep -q "$patch_level_seperator"; then
       patch_level="$(echo "$patch_name" | awk -F"$patch_level_seperator" '{print $2}')"
       patch_name="$(echo "$patch_name" | awk -F"$patch_level_seperator" '{print $1}')"
     fi
@@ -63,7 +63,12 @@ __rvm_apply_patches() {
 }
 
 __rvm_install_source() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+  [[ -z "$rvm_ruby_selected_flag" ]] && __rvm_select
+  
+  if [[ "$rvm_ruby_string" = "ruby-1.9.2-head" ]] ; then
+    # Ensure we have a base ruby.
+    __rvm_ensure_has_18_compat_ruby || return 1
+  fi
 
   $rvm_scripts_path/log "info" "Installing Ruby from source to: $rvm_ruby_home"
   __rvm_pushpop "$rvm_src_path"
@@ -109,11 +114,21 @@ __rvm_install_source() {
       __rvm_db "${rvm_ruby_interpreter}_configure_flags" "db_configure_flags"
     fi
 
+    # On 1.9.2, we manually set the --with-baseruby option
+    # to point to an expanded path.
+    if [[ "$rvm_ruby_string" = "ruby-1.9.2-head" ]] ; then
+      local compatible_baseruby="$rvm_wrappers_path/$(__rvm_18_compat_ruby)/ruby"
+      if [[ -x "$compatible_baseruby" ]] ; then
+        configure_parameters="--with-baseruby=$compatible_baseruby"
+      fi
+    fi
+
     local configure_command="./configure --prefix=$rvm_ruby_home $db_configure_flags $rvm_ruby_configure_flags $configure_parameters"
     __rvm_run "configure" "$configure_command" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
+    unset configure_parameters db_configure_flags
     result=$? ; if [[ "$result" -gt 0 ]] ; then
       $rvm_scripts_path/log "error" "There has been an error while running configure. Aborting the installation." ; __rvm_pushpop ; return $result
-    fi ; unset configure_parameters db_configure_flags
+    fi
   else
     $rvm_scripts_path/log "error" "Skipping configure step, 'configure' does not exist, did autoconf not run successfully?"
   fi
@@ -470,7 +485,7 @@ RubyWrapper
 
       if [[ -n "$rvm_head_flag" ]] ; then
         builtin cd $rvm_ruby_src_path
-        rvm_gemstone_package_file="GemStone-$(grep ^GEMSTONE version.txt | cut -f2 -d-).$(uname -sm | \tr ' ' '-')"
+        rvm_gemstone_package_file="GemStone-$(\grep ^GEMSTONE version.txt | cut -f2 -d-).$(uname -sm | \tr ' ' '-')"
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
       fi
 
@@ -731,12 +746,16 @@ __rvm_fetch_from_github() {
 }
 
 __rvm_fetch_ruby() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
+  [[ -z "$rvm_ruby_selected_flag" ]] && __rvm_select
 
-  if [[ -z "$rvm_head_flag" ]] && [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
+  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"}"
     rvm_ruby_package_file="${rvm_ruby_package_file:-"$rvm_ruby_package_name"}"
-    rvm_archive_extension="${rvm_archive_extension:-tar.gz}"
+    if [[ "ruby" = "$rvm_ruby_interpreter" ]]; then
+      rvm_archive_extension="${rvm_archive_extension:-tar.bz2}"
+    else
+      rvm_archive_extension="${rvm_archive_extension:-tar.gz}"
+    fi
 
     if [[ ! -s "$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension" ]] ; then
       if [[ "ruby" = "$rvm_ruby_interpreter" ]] ; then
@@ -772,6 +791,11 @@ __rvm_fetch_ruby() {
         result=$? ; if [[ "$result" -gt 0 ]] ; then
           $rvm_scripts_path/log "error" "There has been an error while trying to extract $rvm_ruby_package_file. Aborting the installation." ; __rvm_pushpop ; return $result
         fi
+      elif [[ "tar.bz2" = "$rvm_archive_extension" ]] ; then
+        __rvm_run "extract" "cat $rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension | bunzip2 | tar xf - -C /tmp/rvm_src_$$" "Extracting $rvm_ruby_package_file ..."
+        result=$? ; if [[ "$result" -gt 0 ]] ; then
+          $rvm_scripts_path/log "error" "There has been an error while trying to extract the source. Aborting the installation." ; __rvm_pushpop ; return $result
+        fi
       fi
 
       mv "/tmp/rvm_src_$$/$(\cd /tmp/rvm_src_$$ ; \ls)" "$rvm_ruby_src_path" ; \rm -rf "/tmp/rvm_src_$$"
@@ -1062,7 +1086,7 @@ __rvm_rubygems_setup() {
     directory_name="$rvm_ruby_home/lib/ruby/gems"
     version_number="${rvm_release_version}.${rvm_major_version}"
     if [[ "$version_number" == "." ]]; then
-      version_number="$(\ls "$directory_name" | grep '^[[:digit:]].[[:digit:]]\(.[[:digit:]]\)\?' | head -n1)"
+      version_number="$(\ls "$directory_name" | \grep '^[[:digit:]].[[:digit:]]\(.[[:digit:]]\)\?' | head -n1)"
       if [[ -n "$version_number" ]]; then
         ruby_lib_gem_path="${directory_name}/${version_number}"
       else

data/scripts/package

@@ -145,15 +145,15 @@ libxml2() {
 }
 
 glib() {
+  pkgconfig
+  gettext
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
-  configure="CC=\"cc -L$rvm_usr_path/lib\" ./configure --prefix=$rvm_usr_path"
+  configure="CC=\"cc -L$rvm_usr_path/lib -I$rvm_usr_path/include\" PKG_CONFIG=\"$rvm_usr_path/bin/pkg-config\" ./configure --prefix=$rvm_usr_path"
 
   install_package
 }
 
 mono() {
-  gettext
-  pkgconfig
   glib
 
   __rvm_mono_env

data/scripts/rvm

@@ -12,7 +12,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   if [[ -z "$rvm_ignore_rvmrc" ]]; then
     for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
       if [[ -f "$rvmrc" ]] ; then
-        if grep -q '^\s*rvm .*$' $rvmrc ; then
+        if \grep -q '^\s*rvm .*$' $rvmrc ; then
           printf "\nError: $rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
           return 1
         else
@@ -40,7 +40,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   fi
 
   # Fix rvm_prefix changes.
-  echo "$rvm_prefix" | grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
+  echo "$rvm_prefix" | \grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
   rvm_prefix_needs_trailing_slash="$?"
   if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
     rvm_prefix="$rvm_prefix/"
@@ -68,7 +68,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
 
     alias rvm-restart="source '${rvm_path}/scripts/rvm'"
 
-    if ! command -v ruby >/dev/null 2>&1 || command -v ruby | grep -v rvm >/dev/null ; then
+    if ! command -v ruby >/dev/null 2>&1 || command -v ruby | \grep -v rvm >/dev/null ; then
      [[ -s "$rvm_environments_path/default" ]] && source "$rvm_environments_path/default"
     fi
   else

data/scripts/rvm-install

@@ -47,7 +47,7 @@ spinner() {
   command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+if echo "$*" | \grep -q 'trace' ; then echo "$*" ; env | \grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -72,7 +72,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
+if \grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || \grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -178,12 +178,12 @@ if [[ -n "$rvm_auto_flag" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
       if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
-        if ! grep -q '.profile' "$rcfile" ; then
+        if ! \grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
           printf "\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
+      if ! \grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
         printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
       fi
@@ -275,7 +275,7 @@ done
 
 # Move from legacy defaults to the new, alias based system.
 if [[ -s "$rvm_config_path/default" ]]; then
-  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
+  original_version="$(basename "$(\grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
   if [[ -n "$original_version" ]]; then
     $rvm_scripts_path/alias create default "$original_version" &> /dev/null
   fi
@@ -335,7 +335,7 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
+  if [[ -s "$HOME/.bashrc" ]] && \grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
     printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
     printf "\n   if [[ -n \"\$PS1\" ]] ; then"

data/scripts/selector

@@ -4,10 +4,10 @@
 __rvm_select() {
   if [[ -z "$rvm_ruby_string" ]] ; then
     rvm_ruby_string="${rvm_ruby_interpreter}"
-    if [[ -n "$rvm_ruby_version" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_version" ; fi
-    if [[ -n "$rvm_ruby_patch_level" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_patch_level" ; fi
-    if [[ -n "$rvm_ruby_revision" ]] ; then rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_revision" ; fi
-    if [[ -n "$rvm_ruby_name" ]]; then rvm_ruby_name="$rvm_ruby_string-n$rvm_ruby_name"; fi
+    [[ -n "$rvm_ruby_version" ]]     && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_version"
+    [[ -n "$rvm_ruby_patch_level" ]] && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_patch_level"
+    [[ -n "$rvm_ruby_revision" ]]    && rvm_ruby_string="$rvm_ruby_string-$rvm_ruby_revision"
+    [[ -n "$rvm_ruby_name" ]]        && rvm_ruby_name="$rvm_ruby_string-n$rvm_ruby_name"
   fi
 
   __rvm_ruby_string
@@ -147,10 +147,13 @@ __rvm_select() {
     ;;
 
     ruby)
-      if [[ -z "$rvm_ruby_version" ]]  && [[ -z "$rvm_head_flag" ]]; then
+      if [[ -z "$rvm_ruby_version" && -z "$rvm_head_flag" ]]; then
         $rvm_scripts_path/log "fail" "Unknown ruby version: $rvm_ruby_version"
       else
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
+        if [[ -z "$rvm_head_flag" ]]; then
+          rvm_archive_extension="tar.bz2"
+        fi
       fi
     ;;
 
@@ -229,7 +232,7 @@ __rvm_use() {
     new_path="$(echo $PATH | \tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
     new_path="$rvm_bin_path:$new_path"
     if [[ -s $rvm_config_path/system ]] ; then
-      grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
+      \grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
       if [[ $? -eq 0 ]] ; then
         [[ -f "$rvm_config_path/system" ]] && \rm -f $rvm_config_path/system # 'system' should *not* point to an rvm ruby.
       else
@@ -338,6 +341,8 @@ __rvm_use() {
     fi
   fi
 
+  # Rehash executable locations, e.g. to force the shell to recognize new items in the path.
+  builtin hash -r
   rvm_hook="after_use" ; source $rvm_scripts_path/hook
 }
 
@@ -559,7 +564,7 @@ __rvm_gemset_select() {
 
   # Ensure that the ruby gem home exists.
   \mkdir -p "$rvm_ruby_gem_home"
-  if [[ -n "$rvm_ruby_gem_home" ]] && echo "$rvm_ruby_gem_home" | grep -q 'rvm'; then
+  if [[ -n "$rvm_ruby_gem_home" ]] && echo "$rvm_ruby_gem_home" | \grep -q 'rvm'; then
     if __rvm_using_gemset_globalcache && [[ ! -L "$rvm_ruby_gem_home/cache" ]]; then
       mv "$rvm_ruby_gem_home/cache/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
       \rm -rf "$rvm_ruby_gem_home/cache"

data/scripts/set

@@ -162,7 +162,7 @@ action="$1";
 [[ "$#" -gt 0 ]] && shift
 args="$*"
 
-if [[ "$action" == "ruby" ]] && echo "$args" | grep -q  "^'--[^[:space:]]*'$" ; then
+if [[ "$action" == "ruby" ]] && echo "$args" | \grep -q  "^'--[^[:space:]]*'$" ; then
   $rvm_scripts_path/log "warn" "You called rvm ruby with the arguments $args which look like use options."
   $rvm_scripts_path/log "warn" "Please note that 'rvm ruby' invokes set operations instead."
 fi

data/scripts/snapshot

@@ -63,8 +63,8 @@ snapshot_save() {
   comm -2 -3 "$snapshot_ruby_name_file" "$snapshot_alias_name_file" > "$snapshot_installable_file"
   \rm -rf "$snapshot_ruby_name_file" "$snapshot_alias_name_file"
 
-  local snapshot_primary_ruby="$(cat "$snapshot_installable_file" | grep '^\(ree\|ruby-1.8.7\)' | grep -v '-head$' | sort -r | head -n1)"
-  local snapshot_ruby_order="$snapshot_primary_ruby $(cat "$snapshot_installable_file" | grep -v "$snapshot_primary_ruby")"
+  local snapshot_primary_ruby="$(cat "$snapshot_installable_file" | \grep '^\(ree\|ruby-1.8.7\)' | \grep -v '-head$' | sort -r | head -n1)"
+  local snapshot_ruby_order="$snapshot_primary_ruby $(cat "$snapshot_installable_file" | \grep -v "$snapshot_primary_ruby")"
   for snapshot_ruby_name in $snapshot_ruby_order ; do
     snapshot_install_command="$(__rvm_recorded_install_command "$snapshot_ruby_name")"
     if [[ -n "$snapshot_install_command" ]]; then
@@ -139,7 +139,7 @@ snapshot_load() {
   export rvm_create_flag=1
   $rvm_scripts_path/log "info" "Setting up gemsets"
   __rvm_pushpop "$snapshot_temp_path/gems"
-  for snapshot_gemset in $(\ls | grep '\.gems$' | sed 's/.gems$//'); do
+  for snapshot_gemset in $(\ls | \grep '\.gems$' | sed 's/.gems$//'); do
     __rvm_become "$snapshot_gemset"
     result="$?"
     __error_on_result "$result" "Error becoming '$snapshot_gemset'" && return "$result"

data/scripts/update

@@ -47,7 +47,7 @@ spinner() {
   command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+if echo "$*" | \grep -q 'trace' ; then echo "$*" ; env | \grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -72,7 +72,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
+if \grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || \grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -178,12 +178,12 @@ if [[ -n "$rvm_auto_flag" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
       if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
-        if ! grep -q '.profile' "$rcfile" ; then
+        if ! \grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
           printf "\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
+      if ! \grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
         printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
       fi
@@ -275,7 +275,7 @@ done
 
 # Move from legacy defaults to the new, alias based system.
 if [[ -s "$rvm_config_path/default" ]]; then
-  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
+  original_version="$(basename "$(\grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
   if [[ -n "$original_version" ]]; then
     $rvm_scripts_path/alias create default "$original_version" &> /dev/null
   fi
@@ -335,7 +335,7 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
+  if [[ -s "$HOME/.bashrc" ]] && \grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
     printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
     printf "\n   if [[ -n \"\$PS1\" ]] ; then"

data/scripts/upgrade

@@ -13,7 +13,7 @@ confirm() {
   printf "$1 (Y/n): "
   local confirmation_response
   read -r confirmation_response
-  [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | grep -qi '^y'
+  [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | \grep -qi '^y'
 }
 
 die_with_error() {
@@ -33,30 +33,30 @@ expand_existing_ruby() {
       echo "$ruby_name"
       return 0
     fi
-  done < <($rvm_scripts_path/list strings | tr ' ' '\n'  | sort -ur | grep "^$prefix" | grep -v '-head$' | head -n1)
+  done < <($rvm_scripts_path/list strings | tr ' ' '\n'  | sort -ur | \grep "^$prefix" | \grep -v '-head$' | head -n1)
   return 1
 }
 
 upgrade_ruby() {
   [[ -z "$source_ruby" ]] && die_with_error "Unable to find a source ruby. Please manually provide one."
-  
+
   expanded_source="$(expand_ruby_name "$source_ruby")"
   [[ -z "$expanded_source" ]] && die_with_error "The source ruby was not a valid ruby string."
-  
+
   confirm "Are you sure you wish to upgrade from $expanded_source to $expanded_destination?" || die_with_error "Cancelling upgrade."
-  
+
   if [[ ! -d "$rvm_rubies_path/$expanded_destination" ]]; then
     $rvm_scripts_path/log "info" "Installing new ruby $expanded_destination"
     $rvm_bin_path/rvm install "$expanded_destination"
     result="$?"
     [[ "$result" -gt 0 ]] && die_with_error "Unable to install ruby $expanded_destination. Please install it manually to continue." "$result"
   fi
-  
+
   $rvm_scripts_path/log "info" "Migrating gems from $expanded_source to $expanded_destination"
   $rvm_scripts_path/migrate "$expanded_source" "$expanded_destination"
   result="$?"
   [[ "$result" -gt 0 ]] && die_with_error "Error migrating gems." "$result"
-  
+
   $rvm_scripts_path/log "info" "Upgrade complete!"
 }
 
@@ -68,4 +68,4 @@ expanded_destination="$(expand_ruby_name "$destination_ruby")"
 
 source_ruby="${1:-"$(expand_existing_ruby "$destination_ruby")"}"
 
-upgrade_ruby
+upgrade_ruby

data/scripts/utility

@@ -5,7 +5,7 @@ __rvm_setup() {
   if [[ -n "$ZSH_VERSION" ]] ; then
     __shell_array_start=1
     # Set clobber for zsh users, for compatibility with bash's append operator ( >> file ) behavior
-    setopt | grep -qs '^noclobber$'
+    setopt | \grep -qs '^noclobber$'
     rvm_zsh_clobber=$?
     setopt clobber
   else
@@ -88,12 +88,12 @@ __rvm_db() {
   unset key value variable
 }
 
-is_a_function() { type $1 | head -n 1 | grep -q "function" ; }
+is_a_function() { type $1 | head -n 1 | \grep -q "function" ; }
 
 __rvm_quote_args() {
   local quoted_string=""
   for quoted_argument in "$@"; do
-    if printf "%s" "$quoted_argument" | grep -vq "^[[:alnum:]]$"; then
+    if printf "%s" "$quoted_argument" | \grep -vq "^[[:alnum:]]$"; then
       quoted_string="$quoted_string '$(printf "%s" "$quoted_argument" | sed "s/'/\'\\\'\'/g")'"
     else
       quoted_string="$quoted_string $quoted_argument"
@@ -160,7 +160,7 @@ __rvm_clean_path() {
 
 # Clean all rvm items out of the current working path.
 __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
 }
 
@@ -305,7 +305,7 @@ __rvm_load_rvmrc() {
   [[ -z "$rvm_ignore_rvmrc" ]] && return
   for rvmrc in /etc/rvmrc $HOME/.rvmrc ; do
     if [[ -f "$rvmrc" ]] ; then
-      if grep -q '^\s*rvm .*$' $rvmrc ; then
+      if \grep -q '^\s*rvm .*$' $rvmrc ; then
         $rvm_scripts_path/log "error" "$rvmrc is for rvm settings only.\nrvm CLI may NOT be called from within $rvmrc. \nSkipping the loading of $rvmrc"
         return 1
       else
@@ -422,7 +422,7 @@ __rvm_initialize() {
 
   __rvm_clean_path
 
-  if echo "$PATH" | grep -q 'rvm\/bin:' ; then
+  if echo "$PATH" | \grep -q 'rvm\/bin:' ; then
     PATH="${rvm_bin_path}:$PATH"
     export PATH
   fi
@@ -626,7 +626,7 @@ __rvm_strip() {
 }
 
 __rvm_using_gemset_globalcache() {
-  $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" | grep -q '^true$'
+  $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" | \grep -q '^true$'
 }
 
 __rvm_current_gemcache_dir() {
@@ -658,6 +658,118 @@ __rvm_load_env_file() {
   fi
 }
 
+__rvm_md5_for() {
+  if command -v md5 > /dev/null; then
+    echo "$1" | md5
+  else
+    echo "$1" | md5sum | awk '{print $1}'
+  fi
+}
+
+__rvm_rvmrc_key() {
+  __rvm_md5_for "$1"
+}
+
+__rvm_reset_rvmrc_trust() {
+  touch "$rvm_config_path/rvmrcs"
+  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "delete" >/dev/null 2>&1
+}
+
+__rvm_trust_rvmrc() {
+  touch "$rvm_config_path/rvmrcs"
+  __rvm_reset_rvmrc_trust "$1"
+  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "1" >/dev/null 2>&1
+}
+
+__rvm_untrust_rvmrc() {
+  touch "$rvm_config_path/rvmrcs"
+  __rvm_reset_rvmrc_trust "$1"
+  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")" "0" >/dev/null 2>&1
+}
+
+__rvm_rvmrc_stored_trust() {
+  touch "$rvm_config_path/rvmrcs"
+  $rvm_scripts_path/db "$rvm_config_path/rvmrcs" "$(__rvm_rvmrc_key "$1")"
+}
+
+__rvm_rvmrc_tools() {
+  local rvmrc_action="$1"
+  [[ $# -gt 0 ]] && shift
+  local rvmrc_path="$(builtin cd "${1:-$PWD}" >/dev/null 2>&1; pwd)/.rvmrc"
+  case "$rvmrc_action" in
+    reset)
+      __rvm_reset_rvmrc_trust "$rvmrc_path"
+      echo "Reset trust for $rvmrc_path"
+    ;;
+    trust)
+      __rvm_trust_rvmrc "$rvmrc_path"
+      echo "Marked $rvmrc_path as trusted"
+    ;;
+    untrust)
+      __rvm_untrust_rvmrc "$rvmrc_path"
+      echo "Marked $rvmrc_path as untrusted"
+    ;;
+    trusted)
+      local trusted_value="$(__rvm_rvmrc_stored_trust "$rvmrc_path")"
+      if [[ "$trusted_value" = "1" ]]; then
+        echo "The rvmrc at '$rvmrc_path' is currently trusted."
+      elif [[ "$trusted_value" = "0" ]]; then
+        echo "The rvmrc at '$rvmrc_path' is currently untrusted."
+      else
+        echo "The trustiworthiness of '$rvmrc_path' is currently unknown."
+      fi
+    ;;
+    load)
+      rvm_trust_rvmrcs=1 __rvm_project_rvmrc "$(dirname "$rvmrc_path")"
+    ;;
+    *)
+      echo "Usage: rvm rvmrc {trust,untrust,trusted,load,reset}"
+      return 1
+    ;;
+  esac
+}
+
+__rvm_check_rvmrc_trustworthiness() {
+  # Trust when they have the flag... of doom!
+  [[ -z "$1" || "$rvm_trust_rvmrcs" = "1" ]] && return
+  value="$(__rvm_rvmrc_stored_trust "$1")"
+  if [[ -z "$value" ]] ; then
+    __rvm_ask_to_trust "$1"
+  else
+    [[ "$value" = "1" ]]
+  fi
+}
+
+__rvm_ask_to_trust() {
+  echo "Changing into a directory with an untrusted .rvmrc"
+  echo "Do you wish to trust the rvmrc in this directory? It contains:"
+  echo "---"
+  echo ""
+  cat "$1"
+  echo ""
+  echo "---"
+  echo "So, do you wish to trust it? (y for yes, n for no)"
+  local trusted=""
+  while [[ -z "$trusted" ]] ; do
+    printf ">> "
+    read -r value
+    value="$(echo "$value" | tr '[[:upper:]]' '[[:lower:]]' | __rvm_strip)"
+    if [[ "$value" = "y"* ]]; then
+      trusted=1
+    elif [[ "$value" = "n"* ]]; then
+      trusted=0
+    fi
+  done
+  unset value
+  if [[ "$trusted" == "1" ]] ; then
+    __rvm_trust_rvmrc "$1"
+    return 0
+  else
+    __rvm_untrust_rvmrc "$1"
+    return 1
+  fi
+}
+
 # Checks the rvmrc for the given directory. Note that if
 # argument is passed, it will be used instead of pwd.
 __rvm_project_rvmrc() {
@@ -677,9 +789,11 @@ __rvm_project_rvmrc() {
     else
       if [[ -f "$cwd/.rvmrc" ]] ; then
         if [[ "$rvm_rvmrc_cwd" != "$cwd" ]] ; then
-          rvm_previous_environment="$(__rvm_environment_identifier)"
-          rvm_rvmrc_cwd="$cwd"
-          source "$cwd/.rvmrc"
+          if __rvm_check_rvmrc_trustworthiness "$cwd/.rvmrc" ; then
+            rvm_previous_environment="$(__rvm_environment_identifier)"
+            rvm_rvmrc_cwd="$cwd"
+            source "$cwd/.rvmrc"
+          fi
         fi
         break
       else
@@ -696,7 +810,7 @@ __rvm_record_install() {
   local rvm_install_command="$(echo "$recorded_ruby_name $rvm_install_arguments" | __rvm_strip)"
   \touch "$rvm_install_record_file"
   \rm -f "$rvm_install_record_file.tmp"
-  cat "$rvm_install_record_file" | grep -v "^$recorded_ruby_name " > "$rvm_install_record_file.tmp"
+  cat "$rvm_install_record_file" | \grep -v "^$recorded_ruby_name " > "$rvm_install_record_file.tmp"
   echo "$rvm_install_command" >> "$rvm_install_record_file.tmp"
   \rm -f "$rvm_install_record_file"
   mv "$rvm_install_record_file.tmp" "$rvm_install_record_file"
@@ -707,7 +821,7 @@ __rvm_remove_install_record() {
   local rvm_install_record_file="$rvm_config_path/installs"
   if [[ -s "$rvm_install_record_file" ]]; then
     mv "$rvm_install_record_file" "$rvm_install_record_file.tmp"
-    cat "$rvm_install_record_file.tmp" | grep -v "^$recorded_ruby_name " > "$rvm_install_record_file"
+    cat "$rvm_install_record_file.tmp" | \grep -v "^$recorded_ruby_name " > "$rvm_install_record_file"
     \rm -f "$rvm_install_record_file.tmp"
   fi
 }
@@ -716,8 +830,8 @@ __rvm_recorded_install_command() {
   local recorded_ruby_name="$($rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}')"
   [[ -z "$recorded_ruby_name" ]] && return 1
   local recorded_ruby_match="^$recorded_ruby_name "
-  if [[ -s "$rvm_config_path/installs" ]] && grep -q "$recorded_ruby_match" "$rvm_config_path/installs" ; then
-    cat "$rvm_config_path/installs" | grep "$recorded_ruby_match" | head -n1
+  if [[ -s "$rvm_config_path/installs" ]] && \grep -q "$recorded_ruby_match" "$rvm_config_path/installs" ; then
+    cat "$rvm_config_path/installs" | \grep "$recorded_ruby_match" | head -n1
   else
     return 1
   fi
@@ -725,7 +839,7 @@ __rvm_recorded_install_command() {
 
 __rvm_environment_identifier() {
   ruby_string="$(command -v ruby)"
-  if [ -n "$ruby_string" ] && echo "$ruby_string" | grep -q -F "$rvm_rubies_path"; then
+  if [ -n "$ruby_string" ] && echo "$ruby_string" | \grep -q -F "$rvm_rubies_path"; then
     echo "$GEM_HOME" | xargs basename
   else
     echo "system"
@@ -736,18 +850,20 @@ __rvm_environment_identifier() {
 __rvm_expand_ruby_string() {
   if [[ -z "$1" || "$1" = "all" ]]; then
     $rvm_scripts_path/list strings | tr ' ' "\n" | __rvm_strip
-  elif [[ "$1" = "all" || "$1" == "all-gemsets" ]]; then
+  elif [[ "$1" = "all-gemsets" ]]; then
     $rvm_scripts_path/list gemsets strings | __rvm_strip
-  elif [[ "$1" == "default-with-rvmrc" || "$1" == "rvmrc" ]]; then
+  elif [[ "$1" = "default-with-rvmrc" || "$1" = "rvmrc" ]]; then
     $rvm_scripts_path/tools path-identifier "$(pwd)"
-  elif [[ "$1" == "all-rubies" || "$1" == "rubies" ]]; then
+  elif [[ "$1" == "all-rubies" || "$1" = "rubies" ]]; then
     $rvm_scripts_path/list rubies strings | __rvm_strip
-  elif [[ "$1" == "current" || "$1" == "gemsets" ]]; then
+  elif [[ "$1" == "current-ruby" || "$1" = "gemsets" ]]; then
     local current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
     rvm_silence_logging=1 $rvm_scripts_path/gemsets list | sed "s/^/$current_ruby$rvm_gemset_separator/"  | __rvm_strip
-  elif [[ "$1" == "aliases" ]]; then
+  elif [[ "$1" = "current" ]]; then
+    __rvm_environment_identifier
+  elif [[ "$1" = "aliases" ]]; then
     cat "$rvm_config_path/alias" | awk -F= '{print $1}' | __rvm_strip
   else
     echo "$1" | tr "," "\n" | __rvm_strip
   fi
-}
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 23
   prerelease: false
   segments: 
-  - 0
   - 1
-  - 47
-  version: 0.1.47
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 -04:00
+date: 2010-08-22 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []