aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2016-08-24 10:55:46 +0100
committerMike McQuaid2016-08-24 10:56:28 +0100
commit2f9bf5f047ccc86b3d8f609265bd1af0981580f8 (patch)
tree09c5acac094ca960aab1234b6273c5b027f41c78
parentdb4ce3d6b71b2de8b8ed93679a991382bb5c92fe (diff)
downloadbrew-2f9bf5f047ccc86b3d8f609265bd1af0981580f8.tar.bz2
bin/brew: split up brew file symlink check.
This will enable this code to be reused in a future commit and makes it more obvious what’s being done.
-rwxr-xr-xbin/brew13
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/brew b/bin/brew
index f73ba14e1..167a09756 100755
--- a/bin/brew
+++ b/bin/brew
@@ -5,6 +5,13 @@ quiet_cd() {
cd "$@" >/dev/null
}
+symlink_target_directory() {
+ local target="$(readlink "$1")"
+ local target_dirname="$(dirname "$target")"
+ local directory="$2"
+ quiet_cd "$directory" && quiet_cd "$target_dirname" && pwd -P
+}
+
BREW_FILE_DIRECTORY="$(quiet_cd "${0%/*}/" && pwd -P)"
HOMEBREW_BREW_FILE="${BREW_FILE_DIRECTORY%/}/${0##*/}"
HOMEBREW_PREFIX="${HOMEBREW_BREW_FILE%/*/*}"
@@ -17,12 +24,10 @@ fi
HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX"
+# Resolve the bin/brew symlink to find Homebrew's repository
if [[ -L "$HOMEBREW_BREW_FILE" ]]
then
- BREW_SYMLINK="$(readlink "$HOMEBREW_BREW_FILE")"
- BREW_SYMLINK_DIRECTORY="$(dirname "$BREW_SYMLINK")"
- BREW_FILE_DIRECTORY="$(quiet_cd "$BREW_FILE_DIRECTORY" &&
- quiet_cd "$BREW_SYMLINK_DIRECTORY" && pwd -P)"
+ BREW_FILE_DIRECTORY="$(symlink_target_directory "$HOMEBREW_BREW_FILE" "$BREW_FILE_DIRECTORY")"
HOMEBREW_REPOSITORY="${BREW_FILE_DIRECTORY%/*}"
fi