Permalink
Browse files

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

  • Loading branch information...
2 parents db79e02 + 2ef5328 commit d73f63e1e6022eb1f4de7937fa03abd369b36690 @mpapis mpapis committed Jun 5, 2011
Showing with 8 additions and 9 deletions.
  1. +4 −4 scripts/functions/bundler
  2. +1 −1 scripts/functions/installer
  3. +3 −4 scripts/rvm
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
-function bundle()
+bundle()
{
- if (unset bundle ; command -v bundle) >/dev/null 2>&1
+ if (unset bundle ; command -v bundle >/dev/null 2>&1)
then
true
else
- if command -v gem >/dev/null 2>&1
+ if (unset gem ; command -v gem >/dev/null 2>&1)
then
# Ensure that Bundler is installed. Install it if it is not.
printf "The rubygem 'bundler' is not installed. Installing it now.\n"
@@ -16,7 +16,7 @@ function bundle()
fi
fi
- if (unset bundle ; command -v bundle) >/dev/null 2>&1
+ if (unset bundle ; command -v bundle >/dev/null 2>&1)
then
if [[ "$*" =~ 'install' ]]
then
@@ -141,7 +141,7 @@ display_thank_you()
${name:-"${USER:-$(id | sed -e 's/^[^(]*(//' -e 's/).*$//')}"},
Thank you very much for using RVM! I sincerely hope that RVM helps to
-make your work both easier and more enjoyable.
+make your life both easier and more enjoyable.
If you have any questions, issues and/or ideas for improvement please
join#rvm on irc.freenode.net and let me know, note you must register
View
@@ -115,12 +115,11 @@ 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
+ if ! command -v ruby >/dev/null 2>&1 || command -v ruby | \grep -v rvm >/dev/null
then
- if [[ -s "$rvm_environments_path/default" ]]
+ if [[ -s "$rvm_path/environments/default" ]]
then
- source "$rvm_environments_path/default"
+ source "$rvm_path/environments/default"
fi
fi

0 comments on commit d73f63e

Please sign in to comment.