adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplified verbose comments in GNU utils plugin.

Browse Source
This commit is contained in:
Sorin Ionescu 2011-07-17 20:42:16 -04:00
parent af04d57948
commit 9662a4d43b
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/gnu-utils/gnu-utils.plugin.zsh
View File

@ -1,13 +1,13 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# FILE: gnu-utils.plugin.zsh # FILE: gnu-utils.plugin.zsh
# DESCRIPTION: oh-my-zsh plugin file. # DESCRIPTION: oh-my-zsh plugin file.
# AUTHOR: Sorin Ionescu (sorin.ionescu@gmail.com) # AUTHOR: Sorin Ionescu <sorin.ionescu@gmail.com>
# VERSION: 1.0.0 # VERSION: 1.0.1
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
if [[ -x "${commands[gwhoami]}" ]]; then if (( ${+commands[gwhoami]} )); then
__gnu_utils() { function __gnu_utils() {
emulate -L zsh emulate -L zsh
local gcmds local gcmds
local gcmd local gcmd
@ -38,21 +38,10 @@ if [[ -x "${commands[gwhoami]}" ]]; then
# lost if hash -r or rehash -f is executed. Thus, those two # lost if hash -r or rehash -f is executed. Thus, those two
# functions have to be wrapped. # functions have to be wrapped.
# #
(( ${+commands[$gcmd]} )) && hash ${gcmd[2,-1]}=${commands[$gcmd]} if (( ${+commands[$gcmd]} )); then
hash "${gcmd[2,-1]}"="${commands[$gcmd]}"
# unhash "$gcmd"
# This method generates wrapper functions. fi
# It will override shell builtins.
#
# (( ${+commands[$gcmd]} )) && \
# eval "function $gcmd[2,-1]() { \"${prefix}/${gcmd//"["/"\\["}\" \"\$@\"; }"
#
# This method is inflexible since the aliases are at risk of being
# overriden resulting in the BSD coreutils being called.
#
# (( ${+commands[$gcmd]} )) && \
# alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}"
done done
return 0 return 0
@ -69,11 +58,7 @@ if [[ -x "${commands[gwhoami]}" ]]; then
} }
function rehash() { function rehash() {
if [[ "$*" =~ "-f" ]]; then hash -r "$@"
builtin rehash "$@"
__gnu_utils
else
builtin rehash "$@"
fi
} }
fi fi