mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-15 01:48:34 -07:00
fix(gnu-utils): reassign GNU utils on preexec
(#10535)
The previous version rebound the `hash` and `rehash` builtins to reassing GNU utils when they were called. This didn't take into account that when `$PATH` changes, the commands are rehashed as well. This version adds a preexec hook to reassign the GNU utilities before running any command, if and only if they aren't already reassigned. This is checked by looking at the `whoami` command. Fixes #10535
This commit is contained in:
parent
0f1de08713
commit
8cb53ba692
@ -11,11 +11,8 @@ if [[ ! -x "${commands[gwhoami]}" ]]; then
|
||||
fi
|
||||
|
||||
__gnu_utils() {
|
||||
emulate -L zsh
|
||||
local gcmds
|
||||
local -a gcmds
|
||||
local gcmd
|
||||
local cmd
|
||||
local prefix
|
||||
|
||||
# coreutils
|
||||
gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod'
|
||||
@ -43,36 +40,21 @@ __gnu_utils() {
|
||||
(( ${+commands[$gcmd]} )) || continue
|
||||
|
||||
# This method allows for builtin commands to be primary but it's
|
||||
# lost if hash -r or rehash -f is executed. Thus, those two
|
||||
# functions have to be wrapped.
|
||||
# lost if hash -r or rehash is executed, or if $PATH is updated.
|
||||
# Thus, a preexec hook is needed, which will only run if whoami
|
||||
# is not already rehashed.
|
||||
#
|
||||
hash ${gcmd[2,-1]}=${commands[$gcmd]}
|
||||
|
||||
# This method generates wrapper functions.
|
||||
# It will override shell builtins.
|
||||
#
|
||||
# eval "function $gcmd[2,-1]() { \"${prefix}/${gcmd//"["/"\\["}\" \"\$@\"; }"
|
||||
|
||||
# This method is inflexible since the aliases are at risk of being
|
||||
# overridden resulting in the BSD coreutils being called.
|
||||
#
|
||||
# alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}"
|
||||
done
|
||||
|
||||
return 0
|
||||
}
|
||||
__gnu_utils
|
||||
|
||||
function hash() {
|
||||
if [[ "$*" =~ "-(r|f)" ]]; then
|
||||
builtin hash "$@"
|
||||
__gnu_utils
|
||||
else
|
||||
builtin hash "$@"
|
||||
fi
|
||||
__gnu_utils_preexec() {
|
||||
# Run __gnu_utils when the whoami command is not already rehashed.
|
||||
# This acts as a sign that we need to rehash all GNU utils.
|
||||
[[ "${commands[whoami]}" = "${commands[gwhoami]}" ]] || __gnu_utils
|
||||
}
|
||||
|
||||
function rehash() {
|
||||
builtin rehash "$@"
|
||||
__gnu_utils
|
||||
}
|
||||
autoload -Uz add-zsh-hook
|
||||
add-zsh-hook preexec __gnu_utils_preexec
|
||||
|
Loading…
Reference in New Issue
Block a user