Merge branch 'master' of github.com:wayneeseguin/rvm

README

@@ -7,7 +7,7 @@ Flags
 
   --head        - with update, updates rvm to git head version.
   --rubygems    - with update, updates rubygems for selected ruby
-  --default     - with ruby select, sets a default ruby for new shells.
+  --default     - with 'rvm use X', sets the default ruby for new shells to X.
   --debug       - Toggle debug mode on for very verbose output.
   --trace       - Toggle trace mode on to see EVERYTHING rvm is doing.
   --force       - Force install, removes old install & source before install.

config/db

@@ -26,7 +26,7 @@ rubygems_version=1.3.7
 rubygems_1.3.5_url=http://rubyforge.org/frs/download.php/60718
 rubygems_1.3.6_url=http://rubyforge.org/frs/download.php/69365
 rubygems_1.3.7_url=http://rvm.beginrescueend.com/src/
-rbx_version=1.1.0
+rbx_version=head
 rbx_1.0.0_patch_level=20100514
 rbx_1.0.1_patch_level=20100603
 rbx_1.1.0_patch_level=20100923

scripts/cli

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-__rvm_usage() { ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README" ; }
+__rvm_usage() {
+  eval "${PAGER:-less -X} '${rvm_path:-$HOME/.rvm}/README'"
+}
 
 __rvm_run_script()
 {

scripts/help

@@ -15,23 +15,23 @@ args=(${args[@]})
 action="${args[$array_start]}"
 args[$__array_start]=""
 args=(${args[@]})
-pager="${PAGER:-less}"
+pager="${PAGER:-less -X}"
 
 if [[ -n "$command" && -s "${rvm_help_path}/${command}" ]] ; then
 
   if [[ -n "$action" && -s "${rvm_help_path}/${command}/${action}" ]] ; then
 
-    $pager "${rvm_help_path}/${command}/${action}"
+    eval "$pager '${rvm_help_path}/${command}/${action}'"
 
   else
 
-    $pager "${rvm_help_path}/${command}"
+    eval "$pager '${rvm_help_path}/${command}'"
 
   fi
 
 else
 
-  $pager "${rvm_path:-$HOME/.rvm}/README"
+  eval "$pager '${rvm_path:-$HOME/.rvm}/README'"
 
   "$rvm_path/scripts/log" "info" \
     "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; find . -maxdepth 1 -mindepth 1 -type f -print | \tr "\n" ' ' | sed -e 's#./##g')"

scripts/list

@@ -204,7 +204,7 @@ list_known()
 
   else
 
-    ${PAGER:-less} "$rvm_path/config/known"
+    eval "${PAGER:-less -X} '$rvm_path/config/known'"
 
   fi
 

scripts/manage

@@ -648,8 +648,7 @@ RubyWrapper
 
       if [[ "$result" -gt 0 ]] ; then
         "$rvm_path/scripts/log" "error" \
-          "There has been an error while running '$rvm_ruby_configure'. \
-          \nHalting the installation."
+          "There has been an error while running '$rvm_ruby_configure'.\nHalting the installation."
         return $result
       fi ; unset ruby
 

scripts/rvm

@@ -4,9 +4,8 @@
 # http://rvm.beginrescueend.com
 # http://github.com/wayneeseguin/rvm
 
-\grep -q '^rvm ()' < <( declare -f ) # Is RVM is a shell function?
-
-if [[ $? -gt 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
+# Is RVM loaded as a shell function already?
+if ! declare -f rvm > /dev/null || [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
 
   if [[ ${rvm_ignore_rvmrc:-0} -eq 0 ]]; then