Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-09-28 14:06:12 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: Cornelicorn/oh-my-zsh:b37d4878ed1dcd18d7b41289bdae421e8e17a48d
Branches Tags
Cornelicorn/oh-my-zsh:master Cornelicorn/oh-my-zsh:fix-gh-completion-cache-on-failure Cornelicorn/oh-my-zsh:perf/termsupport-memoize-cwd Cornelicorn/oh-my-zsh:feat/theme-browser-local Cornelicorn/oh-my-zsh:feat/opencode-plugin Cornelicorn/oh-my-zsh:perf/lib-autoload-cli-diagnostics Cornelicorn/oh-my-zsh:perf/lib-lazy-vcs-info-patch Cornelicorn/oh-my-zsh:perf/git-plugin-cache-git-version Cornelicorn/oh-my-zsh:fix/installer-backup-history Cornelicorn/oh-my-zsh:task/rr-14045-omz-plugin-create Cornelicorn/oh-my-zsh:copilot/docker-plugin-load-fix Cornelicorn/oh-my-zsh:copilot/fix-per-directory-history-regression Cornelicorn/oh-my-zsh:add-docker-compose-config
..
compare: Cornelicorn/oh-my-zsh:65d305ad061bda65f85b3545fcd18705326d174a
Branches Tags
Cornelicorn/oh-my-zsh:master Cornelicorn/oh-my-zsh:fix-gh-completion-cache-on-failure Cornelicorn/oh-my-zsh:perf/termsupport-memoize-cwd Cornelicorn/oh-my-zsh:feat/theme-browser-local Cornelicorn/oh-my-zsh:feat/opencode-plugin Cornelicorn/oh-my-zsh:perf/lib-autoload-cli-diagnostics Cornelicorn/oh-my-zsh:perf/lib-lazy-vcs-info-patch Cornelicorn/oh-my-zsh:perf/git-plugin-cache-git-version Cornelicorn/oh-my-zsh:fix/installer-backup-history Cornelicorn/oh-my-zsh:task/rr-14045-omz-plugin-create Cornelicorn/oh-my-zsh:copilot/docker-plugin-load-fix Cornelicorn/oh-my-zsh:copilot/fix-per-directory-history-regression Cornelicorn/oh-my-zsh:add-docker-compose-config
2 Commits
b37d4878ed .. 65d305ad06
Author SHA1 Message Date
Robby RussellandClaude Opus 5 65d305ad06 fix(init): bound the LocalHostName cache and don't cache lookup failures 
Keying the cache on $HOST alone can't notice a LocalHostName rename
while HostName stays fixed, which would pin a stale identity forever.
Expire the entry after a day, like lib/grep.zsh does, so a rename is
picked up without giving up the fork on almost every start.

Only write the cache when scutil actually answered, so a transient
failure falls back to ${HOST/.*/} for that shell instead of pinning the
fallback name for the next day.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
 2026-09-07 08:25:24 -07:00
Robby RussellandClaude Opus 5 fe25122da0 perf(init): cache the LocalHostName lookup instead of inferring it 
Deriving SHORT_HOST from a .local suffix assumed $HOST came from
LocalHostName, but macOS lets HostName be set independently, so a
HostName ending in .local would change SHORT_HOST and with it the
zcompdump name and the ssh-agent and keychain cache identities.

Ask scutil as before, but remember its answer against the $HOST it was
looked up for, so the fork only happens when $HOST changes. An
unreadable, empty or unwritable cache falls back to forking every time,
which is today's behaviour.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
 2026-09-07 08:07:51 -07:00
1 changed files with 16 additions and 6 deletions
Expand all files Collapse all files
oh-my-zsh.sh
+16 -6
View File
@@ -100,13 +100,23 @@ done
# Figure out the SHORT hostname
if [[ "$OSTYPE" = darwin* ]]; then
# 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/.*/}"
# scutil costs a fork on every start, so remember its answer for a day
# (like lib/grep.zsh) and re-check sooner if $HOST changes.
__omz_host_cache="$ZSH_CACHE_DIR/localhostname"
__omz_host_cached=("$__omz_host_cache"(Nm-1))
if [[ -n "$__omz_host_cached" ]]; then
{ read -r __omz_host_key && read -r SHORT_HOST } < "$__omz_host_cache"
fi
if [[ "$__omz_host_key" != "$HOST" || -z "$SHORT_HOST" ]]; then
# only cache what scutil actually answered, so a transient failure
# doesn't pin the fallback name for a day
if SHORT_HOST=$(scutil --get LocalHostName 2>/dev/null) && [[ -n "$SHORT_HOST" ]]; then
[[ ! -w "$ZSH_CACHE_DIR" ]] || print -rl -- "$HOST" "$SHORT_HOST" >| "$__omz_host_cache"
else
SHORT_HOST="${HOST/.*/}"
fi
fi
unset __omz_host_cache __omz_host_cached __omz_host_key
else
SHORT_HOST="${HOST/.*/}"
fi