From dd55d98f843306f15477c014c5e793a5e7df83da Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 16 Feb 2016 09:29:03 +0000 Subject: [PATCH] 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 --- Library/brew.sh | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ bin/brew | 38 ++--------- 2 files changed, 177 insertions(+), 33 deletions(-) create mode 100644 Library/brew.sh diff --git a/Library/brew.sh b/Library/brew.sh new file mode 100644 index 00000000000..015ee17e505 --- /dev/null +++ b/Library/brew.sh @@ -0,0 +1,172 @@ +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 $*!" +} + +# 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 + +# 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 </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##*/}" @@ -21,29 +14,8 @@ then chdir "$BREW_SYMLINK_DIRECTORY" && pwd -P)" fi -BREW_LIBRARY_DIRECTORY="$(chdir "$BREW_FILE_DIRECTORY"/../Library && pwd -P)" - -# 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 [ -z "$HOMEBREW_RUBY_PATH" ] -then - if [ "$(uname -s)" = "Darwin" ] - then - HOMEBREW_RUBY_PATH="/usr/bin/ruby" - else - HOMEBREW_RUBY_PATH="$(which ruby)" - fi -fi - -export HOMEBREW_BREW_FILE -export HOMEBREW_RUBY_PATH +HOMEBREW_PREFIX="$(chdir "$(dirname "$(dirname "$HOMEBREW_BREW_FILE")")" && pwd -P)" +HOMEBREW_REPOSITORY="$(chdir "$BREW_FILE_DIRECTORY"/../ && pwd -P)" +HOMEBREW_LIBRARY="$(chdir "$BREW_FILE_DIRECTORY"/../Library && pwd -P)" -exec "$HOMEBREW_RUBY_PATH" -W0 "$BREW_LIBRARY_DIRECTORY/brew.rb" "$@" +source "$HOMEBREW_LIBRARY/brew.sh"