diff options
| author | Misty De Meo | 2012-05-19 19:57:56 -0500 |
|---|---|---|
| committer | Misty De Meo | 2012-06-01 09:24:25 -0500 |
| commit | 7af4622b0f06d0f505f4e57ea4f65b6e8626e2cc (patch) | |
| tree | ff6aa9aeac68d7703085c702f404c827757e4b8c /Library/Contributions | |
| parent | 1a473064679ffb9ef33aacac723cf5865f547e09 (diff) | |
| download | brew-7af4622b0f06d0f505f4e57ea4f65b6e8626e2cc.tar.bz2 | |
Replace /usr/bin/ruby with full Framework path
Rationale: some users insist on replacing the /usr/bin/ruby symlink
to point to another ruby on their system, which may break homebrew.
Use the full Framework path instead, which is less likely to be tampered with.
This also reorganizes the brew --config checks to reflect the different path.
Fixes Homebrew/homebrew#12009.
Closes Homebrew/homebrew#12333.
Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Diffstat (limited to 'Library/Contributions')
| -rw-r--r-- | Library/Contributions/brew_bash_completion.sh | 2 | ||||
| -rwxr-xr-x | Library/Contributions/cmds/brew-server | 2 | ||||
| -rw-r--r-- | Library/Contributions/install_homebrew.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh index 6261f7749..0e573f309 100644 --- a/Library/Contributions/brew_bash_completion.sh +++ b/Library/Contributions/brew_bash_completion.sh @@ -95,7 +95,7 @@ __brew_complete_tapped () __brew_complete_taps () { if [[ -z "$__brew_cached_taps" ]]; then - __brew_cached_taps="$(/usr/bin/ruby -e ' + __brew_cached_taps="$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -e ' require "open-uri" require "yaml" diff --git a/Library/Contributions/cmds/brew-server b/Library/Contributions/cmds/brew-server index bcc15c257..fe81ea64c 100755 --- a/Library/Contributions/cmds/brew-server +++ b/Library/Contributions/cmds/brew-server @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby ## brew server: Run a local webserver for browsing available and installed brews. # Note: this external command is ruby, but set up as a shell script, so that it gets exec'd. diff --git a/Library/Contributions/install_homebrew.rb b/Library/Contributions/install_homebrew.rb index 32099946f..3cf4f2f1c 100644 --- a/Library/Contributions/install_homebrew.rb +++ b/Library/Contributions/install_homebrew.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby # This script installs to /usr/local only. To install elsewhere you can just # untar https://github.com/mxcl/homebrew/tarball/master anywhere you like. |