admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

brew.sh: handle development git version strings

Browse Source
This commit is contained in:
EricFromCanada 2019-08-07 14:22:20 -04:00
parent 7e267b3858
commit dcd8842d9d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/brew.sh
View File

@ -61,7 +61,7 @@ git() {
numeric() { numeric() {
# Condense the exploded argument into a single return value. # Condense the exploded argument into a single return value.
# shellcheck disable=SC2086,SC2183 # shellcheck disable=SC2086,SC2183
printf "%01d%02d%02d%02d" ${1//[.rc]/ } printf "%01d%02d%02d%03d" ${1//[.rc]/ }
} }
HOMEBREW_VERSION="$(git -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbrev=7 2>/dev/null)" HOMEBREW_VERSION="$(git -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbrev=7 2>/dev/null)"
@ -162,7 +162,10 @@ else
# Git 2.7.4 is the version of git on Ubuntu 16.04 LTS (Xenial Xerus). # Git 2.7.4 is the version of git on Ubuntu 16.04 LTS (Xenial Xerus).
HOMEBREW_MINIMUM_GIT_VERSION="2.7.0" HOMEBREW_MINIMUM_GIT_VERSION="2.7.0"
system_git_version_output="$($(command -v git) --version 2>/dev/null)" system_git_version_output="$($(command -v git) --version 2>/dev/null)"
if [[ $(numeric "${system_git_version_output##* }") -lt $(numeric "$HOMEBREW_MINIMUM_GIT_VERSION") ]] # $extra is intentionally discarded.
# shellcheck disable=SC2034
IFS=. read -r major minor micro build extra <<< "${system_git_version_output##* }"
if [[ $(numeric "$major.$minor.$micro.$build") -lt $(numeric "$HOMEBREW_MINIMUM_GIT_VERSION") ]]
then then
HOMEBREW_FORCE_BREWED_GIT="1" HOMEBREW_FORCE_BREWED_GIT="1"
fi fi