shims/scm: handle missing Subversion on Catalina.

Fixes https://github.com/Homebrew/brew/issues/7781
This commit is contained in:
Mike McQuaid 2020-06-24 09:12:08 +01:00
parent 1dbbb5e58c
commit f8091a4d51
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70

View File

@ -137,8 +137,11 @@ fi
path="/Applications/Xcode.app/Contents/Developer/usr/bin/$SCM_FILE"
safe_exec "$path" "$@"
path="/usr/bin/$SCM_FILE"
[[ -z "$popup_stub" ]] && safe_exec "$path" "$@"
if [[ -z "$popup_stub" && "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "101500" ]]
then
path="/usr/bin/$SCM_FILE"
safe_exec "$path" "$@"
fi
echo "You must: brew install $SCM_FILE" >&2
exit 1