From 561e0b04a8e23b9088010d4b08f55683decf05db Mon Sep 17 00:00:00 2001 From: Christoph Anton Mitterer Date: Wed, 11 Oct 2023 06:07:47 +0200 Subject: [PATCH] =?UTF-8?q?[bash]=20Use=20`command`=20to=20=E2=80=9Cprotec?= =?UTF-8?q?t=E2=80=9D=20further=20commands=20(#3462)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit causes all simple commands that are not built-ins or functions to be invoked via `command` in order to protect them from alias substitution or from accidentally taking functions of the same name. It was decided to not “protect” `fzf` and `fzf-tmux` for now. Maybe a better solution should be implemented for that in the future. Signed-off-by: Christoph Anton Mitterer --- shell/completion.bash | 24 ++++++++++++------------ shell/key-bindings.bash | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/shell/completion.bash b/shell/completion.bash index 2c66b69..7532bb9 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -18,7 +18,7 @@ if ! declare -F _fzf_compgen_path > /dev/null; then echo "$1" command find -L "$1" \ -name .git -prune -o -name .hg -prune -o -name .svn -prune -o \( -type d -o -type f -o -type l \) \ - -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' + -a -not -path "$1" -print 2> /dev/null | command sed 's@^\./@@' } fi @@ -26,7 +26,7 @@ if ! declare -F _fzf_compgen_dir > /dev/null; then _fzf_compgen_dir() { command find -L "$1" \ -name .git -prune -o -name .hg -prune -o -name .svn -prune -o -type d \ - -a -not -path "$1" -print 2> /dev/null | sed 's@^\./@@' + -a -not -path "$1" -print 2> /dev/null | command sed 's@^\./@@' } fi @@ -322,7 +322,7 @@ __fzf_generic_path_completion() { printf '\e[5n' return 0 fi - dir=$(dirname "$dir") + dir=$(command dirname "$dir") [[ "$dir" =~ /$ ]] || dir="$dir"/ done else @@ -356,8 +356,8 @@ _fzf_complete() { fi local cur selected trigger cmd post - post="$(caller 0 | awk '{print $2}')_post" - type -t "$post" > /dev/null 2>&1 || post=cat + post="$(caller 0 | command awk '{print $2}')_post" + type -t "$post" > /dev/null 2>&1 || post='command cat' cmd="${COMP_WORDS[0]//[^A-Za-z0-9_=]/_}" trigger=${FZF_COMPLETION_TRIGGER-'**'} @@ -365,7 +365,7 @@ _fzf_complete() { if [[ "$cur" == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then cur=${cur:0:${#cur}-${#trigger}} - selected=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | tr '\n' ' ') + selected=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | command tr '\n' ' ') selected=${selected% } # Strip trailing space not to repeat "-o nospace" if [[ -n "$selected" ]]; then COMPREPLY=("$selected") @@ -404,14 +404,14 @@ _fzf_proc_completion() { } _fzf_proc_completion_post() { - awk '{print $2}' + command awk '{print $2}' } __fzf_list_hosts() { - command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \ - <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \ + command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | command awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \ + <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | command tr ',' '\n' | command tr -d '[' | command awk '{ print $1 " " $1 }') \ <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') | - awk -v "user=$1" '{if (length($2) > 0) {print user $2}}' | sort -u + command awk -v "user=$1" '{if (length($2) > 0) {print user $2}}' | command sort -u } _fzf_host_completion() { @@ -438,13 +438,13 @@ _fzf_complete_ssh() { _fzf_var_completion() { _fzf_complete -m -- "$@" < <( - declare -xp | sed -En 's|^declare [^ ]+ ([^=]+).*|\1|p' + declare -xp | command sed -En 's|^declare [^ ]+ ([^=]+).*|\1|p' ) } _fzf_alias_completion() { _fzf_complete -m -- "$@" < <( - alias | sed -En 's|^alias ([^=]+).*|\1|p' + alias | command sed -En 's|^alias ([^=]+).*|\1|p' ) } diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index e57f2af..c4dce3b 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -21,7 +21,7 @@ __fzf_select__() { cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \ -o -type f -print \ -o -type d -print \ - -o -type l -print 2> /dev/null | cut -b3-"}" + -o -type l -print 2> /dev/null | command cut -b3-"}" opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse --scheme=path ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-} -m" eval "$cmd" | FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) "$@" | @@ -44,7 +44,7 @@ fzf-file-widget() { __fzf_cd__() { local cmd opts dir cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \ - -o -type d -print 2> /dev/null | cut -b3-"}" + -o -type d -print 2> /dev/null | command cut -b3-"}" opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse --scheme=path ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-} +m" dir=$(set +o pipefail; eval "$cmd" | FZF_DEFAULT_OPTS="$opts" $(__fzfcmd)) && printf 'builtin cd -- %q' "$dir" }