mirror of
https://github.com/robbyrussell/oh-my-zsh.git
synced 2026-09-29 14:36:04 +02:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b37d4878ed |
+4
-35
@@ -38,47 +38,16 @@
|
|||||||
# due to malicious input as a consequence of CVE-2021-45444, which affects
|
# due to malicious input as a consequence of CVE-2021-45444, which affects
|
||||||
# zsh versions from 5.0.3 to 5.8.
|
# zsh versions from 5.0.3 to 5.8.
|
||||||
#
|
#
|
||||||
# The patch is applied when VCS_INFO_formats is first called, since loading
|
autoload -Uz +X regexp-replace VCS_INFO_formats 2>/dev/null || return 0
|
||||||
# and patching it on every startup costs time in shells that never use
|
|
||||||
# vcs_info. `autoload` doesn't replace an already defined function, so this
|
|
||||||
# wrapper survives a later `autoload -Uz vcs_info` in a theme or .zshrc, and
|
|
||||||
# vcs_info's own `autoload -Uz VCS_INFO_formats`.
|
|
||||||
if (( $+functions[VCS_INFO_formats] )); then
|
|
||||||
() {
|
|
||||||
autoload -Uz +X regexp-replace 2>/dev/null || return 1
|
|
||||||
|
|
||||||
# We use $tmp here because it's already a local variable in VCS_INFO_formats
|
# We use $tmp here because it's already a local variable in VCS_INFO_formats
|
||||||
local PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
|
typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
|
||||||
# Unique string to avoid reapplying the patch if this code gets called twice
|
# Unique string to avoid reapplying the patch if this code gets called twice
|
||||||
local PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
|
typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
|
||||||
# Only patch the VCS_INFO_formats function if not already patched
|
# Only patch the VCS_INFO_formats function if not already patched
|
||||||
if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
|
if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
|
||||||
regexp-replace 'functions[VCS_INFO_formats]' \
|
regexp-replace 'functions[VCS_INFO_formats]' \
|
||||||
"VCS_INFO_hook 'post-backend'" \
|
"VCS_INFO_hook 'post-backend'" \
|
||||||
': ${PATCH_ID}; ${PATCH}; ${MATCH}'
|
': ${PATCH_ID}; ${PATCH}; ${MATCH}'
|
||||||
fi
|
fi
|
||||||
}
|
unset PATCH PATCH_ID
|
||||||
else
|
|
||||||
function VCS_INFO_formats {
|
|
||||||
local loaded_function="$(
|
|
||||||
unfunction VCS_INFO_formats 2>/dev/null
|
|
||||||
autoload -Uz +X VCS_INFO_formats 2>/dev/null || return 1
|
|
||||||
print -r -- "$functions[VCS_INFO_formats]"
|
|
||||||
)" || return 1
|
|
||||||
functions[VCS_INFO_formats]="$loaded_function"
|
|
||||||
autoload -Uz +X regexp-replace 2>/dev/null || return 1
|
|
||||||
|
|
||||||
# We use $tmp here because it's already a local variable in VCS_INFO_formats
|
|
||||||
local PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
|
|
||||||
# Unique string to avoid reapplying the patch if this code gets called twice
|
|
||||||
local PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
|
|
||||||
# Only patch the VCS_INFO_formats function if not already patched
|
|
||||||
if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
|
|
||||||
regexp-replace 'functions[VCS_INFO_formats]' \
|
|
||||||
"VCS_INFO_hook 'post-backend'" \
|
|
||||||
': ${PATCH_ID}; ${PATCH}; ${MATCH}'
|
|
||||||
fi
|
|
||||||
|
|
||||||
VCS_INFO_formats "$@"
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|||||||
@@ -100,7 +100,13 @@ done
|
|||||||
# Figure out the SHORT hostname
|
# Figure out the SHORT hostname
|
||||||
if [[ "$OSTYPE" = darwin* ]]; then
|
if [[ "$OSTYPE" = darwin* ]]; then
|
||||||
# macOS's $HOST changes with dhcp, etc. Use LocalHostName if possible.
|
# macOS's $HOST changes with dhcp, etc. Use LocalHostName if possible.
|
||||||
|
# When $HOST is the Bonjour name (<LocalHostName>.local) it already is the
|
||||||
|
# LocalHostName, so don't fork scutil to look it up.
|
||||||
|
if [[ "$HOST" = *.local ]]; then
|
||||||
|
SHORT_HOST="${HOST%.local}"
|
||||||
|
else
|
||||||
SHORT_HOST=$(scutil --get LocalHostName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
|
SHORT_HOST=$(scutil --get LocalHostName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
SHORT_HOST="${HOST/.*/}"
|
SHORT_HOST="${HOST/.*/}"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user