Permalink
Browse files

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

  • Loading branch information...
2 parents ee9e2c5 + 0f3fb9a commit c3d69c9098ccf4ed47420dee683fd693855f73b5 @Sutto Sutto committed Nov 16, 2010
Showing with 13 additions and 13 deletions.
  1. +1 −1 README
  2. +1 −1 config/db
  3. +3 −1 scripts/cli
  4. +4 −4 scripts/help
  5. +1 −1 scripts/list
  6. +1 −2 scripts/manage
  7. +2 −3 scripts/rvm
View
2 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.
View
@@ -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
View
@@ -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()
{
View
@@ -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')"
View
@@ -204,7 +204,7 @@ list_known()
else
- ${PAGER:-less} "$rvm_path/config/known"
+ eval "${PAGER:-less -X} '$rvm_path/config/known'"
fi
View
@@ -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
View
@@ -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

0 comments on commit c3d69c9

Please sign in to comment.