Merge pull request #1304 from MikeMcQuaid/old-osx-git-shim-more
scm/git: more old OS X versions tweaks.
This commit is contained in:
commit
87fad259a0
@ -104,6 +104,7 @@ do
|
|||||||
safe_exec "$path" "$@"
|
safe_exec "$path" "$@"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
unset IFS
|
||||||
|
|
||||||
if executable "/usr/bin/xcode-select"
|
if executable "/usr/bin/xcode-select"
|
||||||
then
|
then
|
||||||
@ -113,11 +114,14 @@ then
|
|||||||
xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)"
|
xcode_path="$(/usr/bin/xcode-select -print-path 2>/dev/null)"
|
||||||
if [[ -z "$xcode_path" ]]
|
if [[ -z "$xcode_path" ]]
|
||||||
then
|
then
|
||||||
macos_version="$(/usr/bin/sw_vers -productVersion)"
|
if [[ -z "$HOMEBREW_MACOS_VERSION" ]]
|
||||||
printf -v macos_version_numeric "%02d%02d%02d" ${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" ]]
|
if [[ "$macos_version_numeric" -ge "100900" ]]
|
||||||
then
|
then
|
||||||
unset popup_stub=1
|
popup_stub=1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ -z "$popup_stub" && "$xcode_path" != "/" ]]
|
if [[ -z "$popup_stub" && "$xcode_path" != "/" ]]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user