From 691e4aec11a71bdd88a59391aa7b56ea0cf48639 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 16 Feb 2016 09:29:03 +0000 Subject: bin/brew: move logic to Library. `bin/brew` is getting a bit bloated and it's annoying to open all of `HOMEBREW_PREFIX` in your editor of choice and have it search through the `Cellar`. Let's instead keep the bare minimum in `bin/brew` and move the rest to `Library`. Closes Homebrew/homebrew#49185. Signed-off-by: Mike McQuaid --- bin/brew | 172 +-------------------------------------------------------------- 1 file changed, 2 insertions(+), 170 deletions(-) (limited to 'bin') diff --git a/bin/brew b/bin/brew index dbbea5193..bc963e6c8 100755 --- a/bin/brew +++ b/bin/brew @@ -1,31 +1,8 @@ #!/bin/bash - -odie() { - if [[ -t 2 ]] # check whether stderr is a tty. - then - echo -ne "\033[4;31mError\033[0m: " >&2 # highlight Error with underline and red color - else - echo -n "Error: " >&2 - fi - if [[ $# -eq 0 ]] - then - /bin/cat >&2 - else - echo "$*" >&2 - fi - exit 1 -} - chdir() { - cd "$@" >/dev/null || odie "Error: failed to cd to $*!" + cd "$@" >/dev/null } -# Force UTF-8 to avoid encoding issues for users with broken locale settings. -if [[ "$(locale charmap 2> /dev/null)" != "UTF-8" ]] -then - export LC_ALL="en_US.UTF-8" -fi - BREW_FILE_DIRECTORY="$(chdir "${0%/*}" && pwd -P)" HOMEBREW_BREW_FILE="$BREW_FILE_DIRECTORY/${0##*/}" @@ -41,149 +18,4 @@ HOMEBREW_PREFIX="$(chdir "$(dirname "$(dirname "$HOMEBREW_BREW_FILE")")" && pwd HOMEBREW_REPOSITORY="$(chdir "$BREW_FILE_DIRECTORY"/../ && pwd -P)" HOMEBREW_LIBRARY="$(chdir "$BREW_FILE_DIRECTORY"/../Library && pwd -P)" -# Where we store built products; /usr/local/Cellar if it exists, -# otherwise a Cellar relative to the Repository. -if [[ -d "$HOMEBREW_PREFIX/Cellar" ]] -then - HOMEBREW_CELLAR="$HOMEBREW_PREFIX/Cellar" -else - HOMEBREW_CELLAR="$HOMEBREW_REPOSITORY/Cellar" -fi - -case "$*" in - --prefix) echo "$HOMEBREW_PREFIX"; exit 0 ;; - --cellar) echo "$HOMEBREW_CELLAR"; exit 0 ;; - --repository|--repo) echo "$HOMEBREW_REPOSITORY"; exit 0 ;; -esac - -if [[ "$HOMEBREW_PREFIX" = "/" || "$HOMEBREW_PREFIX" = "/usr" ]] -then - # it may work, but I only see pain this route and don't want to support it - odie "Cowardly refusing to continue at this prefix: $HOMEBREW_PREFIX" -fi - -# Users may have these set, pointing the system Ruby -# at non-system gem paths -unset GEM_HOME -unset GEM_PATH - -if [[ -z "$HOMEBREW_DEVELOPER" ]] -then - unset HOMEBREW_RUBY_PATH -fi - -if [[ "$(uname -s)" = "Darwin" ]] -then - HOMEBREW_OSX="1" -fi - -if [[ -z "$HOMEBREW_RUBY_PATH" ]] -then - if [[ -n "$HOMEBREW_OSX" ]] - then - HOMEBREW_RUBY_PATH="/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby" - else - HOMEBREW_RUBY_PATH="$(which ruby)" - fi -fi - -export HOMEBREW_BREW_FILE -export HOMEBREW_RUBY_PATH -export HOMEBREW_PREFIX -export HOMEBREW_REPOSITORY -export HOMEBREW_LIBRARY -export HOMEBREW_CELLAR - -if [[ -n "$HOMEBREW_OSX" ]] -then - if [[ "$('/usr/bin/xcode-select' --print-path)" = "/" ]] - then - odie <