aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMike McQuaid2015-11-18 15:59:08 +0000
committerMike McQuaid2015-11-18 17:06:28 +0000
commitc6621faf183f175821fd5b7fcd98f2404c8a4be7 (patch)
tree44c19b5c191eb8daeb0e4d6239f5cbb880e48151 /bin
parent11a421948d43210451a536fb40b8c10b838ff8c6 (diff)
downloadbrew-c6621faf183f175821fd5b7fcd98f2404c8a4be7.tar.bz2
travis: test 10.9 using Ruby 1.8.
Closes Homebrew/homebrew#45816. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/brew27
1 files changed, 17 insertions, 10 deletions
diff --git a/bin/brew b/bin/brew
index 20a131317..4a8b535b5 100755
--- a/bin/brew
+++ b/bin/brew
@@ -1,6 +1,5 @@
#!/bin/sh
-
-chdir () {
+chdir() {
cd "$@" >/dev/null
}
@@ -10,9 +9,9 @@ export HOMEBREW_BREW_FILE="$BREW_FILE_DIRECTORY/${0##*/}"
BREW_SYMLINK=$(readlink "$0")
if [ -n "$BREW_SYMLINK" ]
then
- BREW_SYMLINK_DIRECTORY=$(dirname "$BREW_SYMLINK")
- BREW_FILE_DIRECTORY=$(chdir "$BREW_FILE_DIRECTORY" &&
- chdir "$BREW_SYMLINK_DIRECTORY" && pwd -P)
+ BREW_SYMLINK_DIRECTORY=$(dirname "$BREW_SYMLINK")
+ BREW_FILE_DIRECTORY=$(chdir "$BREW_FILE_DIRECTORY" &&
+ chdir "$BREW_SYMLINK_DIRECTORY" && pwd -P)
fi
BREW_LIBRARY_DIRECTORY=$(chdir "$BREW_FILE_DIRECTORY"/../Library && pwd -P)
@@ -22,10 +21,18 @@ BREW_LIBRARY_DIRECTORY=$(chdir "$BREW_FILE_DIRECTORY"/../Library && pwd -P)
unset GEM_HOME
unset GEM_PATH
-BREW_SYSTEM=$(uname -s | tr "[:upper:]" "[:lower:]")
-if [ "$BREW_SYSTEM" = "darwin" ]
+if [ -z "$HOMEBREW_DEVELOPER" ]
then
- exec "$BREW_LIBRARY_DIRECTORY/brew.rb" "$@"
-else
- exec ruby -W0 "$BREW_LIBRARY_DIRECTORY/brew.rb" "$@"
+ unset HOMEBREW_RUBY_PATH
+fi
+
+if [ -z "$HOMEBREW_RUBY_PATH" ]; then
+ BREW_SYSTEM=$(uname -s | tr "[:upper:]" "[:lower:]")
+ if [ "$BREW_SYSTEM" = "darwin" ]; then
+ HOMEBREW_RUBY_PATH="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby"
+ else
+ HOMEBREW_RUBY_PATH="ruby"
+ fi
fi
+
+exec "$HOMEBREW_RUBY_PATH" -W0 "$BREW_LIBRARY_DIRECTORY/brew.rb" "$@"