diff options
| author | Mike McQuaid | 2016-10-16 14:14:23 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-10-16 14:14:23 +0100 |
| commit | 7292ad1f1a1f8f92bac9160b6be6c4a64ac24d5c (patch) | |
| tree | 89b231ec24166a1c64772ff6920c14fc4898f0c0 | |
| parent | 527a62b64bd8c578af08540166a8b1fd5bce521f (diff) | |
| download | brew-7292ad1f1a1f8f92bac9160b6be6c4a64ac24d5c.tar.bz2 | |
shims/scm/git: fix on old OS X versions.
On older versions of OS X (i.e. pre-Mavericks) `xcode-select` is not
required to be set when using the CLT. Fix this behaviour so `brew
update` doesn't tell everyone on that configuration to `brew install
git`.
| -rwxr-xr-x | Library/Homebrew/shims/scm/git | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Library/Homebrew/shims/scm/git b/Library/Homebrew/shims/scm/git index eedca486b..96209df23 100755 --- a/Library/Homebrew/shims/scm/git +++ b/Library/Homebrew/shims/scm/git @@ -111,7 +111,15 @@ then # /usr/bin/<tool> will be a popup stub under such configuration. # xcrun hangs if xcode-select is set to "/" xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)" - [[ -n "$xcode_path" ]] || popup_stub=1 + if [[ -z "$xcode_path" ]] + then + macos_version="$(/usr/bin/sw_vers -productVersion)" + printf -v macos_version_numeric "%02d%02d%02d" ${macos_version//./ } + if [[ "$macos_version_numeric" -ge "100900" ]] + then + unset popup_stub=1 + fi + fi if [[ -z "$popup_stub" && "$xcode_path" != "/" ]] then path="$(/usr/bin/xcrun -find "$SCM_FILE" 2>/dev/null)" |