diff options
| author | Mike McQuaid | 2016-10-16 16:42:48 +0100 |
|---|---|---|
| committer | GitHub | 2016-10-16 16:42:48 +0100 |
| commit | 87fad259a026dba8333934b7d92a244c59eaba50 (patch) | |
| tree | 1a14107e43d8f55e4dd06ac7cac8b1bf9d63255e /Library | |
| parent | 2a18378a035c7a87d97d1deb742c0f7debb89847 (diff) | |
| parent | be2e6df948b2819aabe38864f4b541c8b89ba01f (diff) | |
| download | brew-87fad259a026dba8333934b7d92a244c59eaba50.tar.bz2 | |
Merge pull request #1304 from MikeMcQuaid/old-osx-git-shim-more
scm/git: more old OS X versions tweaks.
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/Homebrew/shims/scm/git | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Library/Homebrew/shims/scm/git b/Library/Homebrew/shims/scm/git index 96209df23..82bb47c25 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" != "/" ]] |