mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18153 from Homebrew/version-cache-handling

Browse Source
This commit is contained in:
Carlo Cabrera 2024-08-28 19:37:15 +08:00 committed by GitHub
commit 01287a742a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/brew.sh
View File

@ -387,7 +387,7 @@ fi
# Docker image deprecation # Docker image deprecation
if [[ -f "${HOMEBREW_REPOSITORY}/.docker-deprecate" ]] if [[ -f "${HOMEBREW_REPOSITORY}/.docker-deprecate" ]]
then then
DOCKER_DEPRECATION_MESSAGE="$(cat "${HOMEBREW_REPOSITORY}/.docker-deprecate")" read -r DOCKER_DEPRECATION_MESSAGE <"${HOMEBREW_REPOSITORY}/.docker-deprecate"
if [[ -n "${GITHUB_ACTIONS}" ]] if [[ -n "${GITHUB_ACTIONS}" ]]
then then
echo "::warning::${DOCKER_DEPRECATION_MESSAGE}" >&2 echo "::warning::${DOCKER_DEPRECATION_MESSAGE}" >&2
@ -443,13 +443,13 @@ GIT_REVISION=$("${HOMEBREW_GIT}" -C "${HOMEBREW_REPOSITORY}" rev-parse HEAD 2>/d
# safe fallback in case git rev-parse fails e.g. if this is not considered a safe git directory # safe fallback in case git rev-parse fails e.g. if this is not considered a safe git directory
if [[ -z "${GIT_REVISION}" ]] if [[ -z "${GIT_REVISION}" ]]
then then
GIT_HEAD="$(cat "${HOMEBREW_REPOSITORY}/.git/HEAD" 2>/dev/null)" read -r GIT_HEAD <"${HOMEBREW_REPOSITORY}/.git/HEAD" 2>/dev/null
if [[ "${GIT_HEAD}" == "ref: refs/heads/master" ]] if [[ "${GIT_HEAD}" == "ref: refs/heads/master" ]]
then then
GIT_REVISION="$(cat "${HOMEBREW_REPOSITORY}/.git/refs/heads/master" 2>/dev/null)" read -r GIT_REVISION <"${HOMEBREW_REPOSITORY}/.git/refs/heads/master" 2>/dev/null
elif [[ "${GIT_HEAD}" == "ref: refs/heads/stable" ]] elif [[ "${GIT_HEAD}" == "ref: refs/heads/stable" ]]
then then
GIT_REVISION="$(cat "${HOMEBREW_REPOSITORY}/.git/refs/heads/stable" 2>/dev/null)" read -r GIT_REVISION <"${HOMEBREW_REPOSITORY}/.git/refs/heads/stable" 2>/dev/null
fi fi
unset GIT_HEAD unset GIT_HEAD
fi fi
@ -457,9 +457,9 @@ fi
if [[ -n "${GIT_REVISION}" ]] if [[ -n "${GIT_REVISION}" ]]
then then
GIT_DESCRIBE_CACHE_FILE="${GIT_DESCRIBE_CACHE}/${GIT_REVISION}" GIT_DESCRIBE_CACHE_FILE="${GIT_DESCRIBE_CACHE}/${GIT_REVISION}"
if [[ -r "${GIT_DESCRIBE_CACHE_FILE}" ]] if [[ -r "${GIT_DESCRIBE_CACHE_FILE}" ]] && "${HOMEBREW_GIT}" -C "${HOMEBREW_REPOSITORY}" diff --quiet --no-ext-diff 2>/dev/null
then then
GIT_DESCRIBE_CACHE_HOMEBREW_VERSION="$(cat "${GIT_DESCRIBE_CACHE_FILE}")" read -r GIT_DESCRIBE_CACHE_HOMEBREW_VERSION <"${GIT_DESCRIBE_CACHE_FILE}"
if [[ -n "${GIT_DESCRIBE_CACHE_HOMEBREW_VERSION}" && "${GIT_DESCRIBE_CACHE_HOMEBREW_VERSION}" != *"-dirty" ]] if [[ -n "${GIT_DESCRIBE_CACHE_HOMEBREW_VERSION}" && "${GIT_DESCRIBE_CACHE_HOMEBREW_VERSION}" != *"-dirty" ]]
then then
HOMEBREW_VERSION="${GIT_DESCRIBE_CACHE_HOMEBREW_VERSION}" HOMEBREW_VERSION="${GIT_DESCRIBE_CACHE_HOMEBREW_VERSION}"