From be2e6df948b2819aabe38864f4b541c8b89ba01f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 16 Oct 2016 16:11:41 +0100 Subject: [PATCH] scm/git: more old OS X versions tweaks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - unset IFS to fix version parsing on older Bashes - reuse existing HOMEBREW_MACOS_VERSION if it’s available - set rather than unset popup_stub --- Library/Homebrew/shims/scm/git | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/shims/scm/git b/Library/Homebrew/shims/scm/git index 96209df23a..82bb47c25e 100755 --- a/Library/Homebrew/shims/scm/git +++ b/Library/Homebrew/shims/scm/git @@ -104,6 +104,7 @@ do safe_exec "$path" "$@" fi done +unset IFS if executable "/usr/bin/xcode-select" then @@ -113,11 +114,14 @@ then xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)" if [[ -z "$xcode_path" ]] then - macos_version="$(/usr/bin/sw_vers -productVersion)" - printf -v macos_version_numeric "%02d%02d%02d" ${macos_version//./ } + if [[ -z "$HOMEBREW_MACOS_VERSION" ]] + then + HOMEBREW_MACOS_VERSION="$(/usr/bin/sw_vers -productVersion)" + fi + printf -v macos_version_numeric "%02d%02d%02d" ${HOMEBREW_MACOS_VERSION//./ } if [[ "$macos_version_numeric" -ge "100900" ]] then - unset popup_stub=1 + popup_stub=1 fi fi if [[ -z "$popup_stub" && "$xcode_path" != "/" ]]