diff options
| author | LangLangBart <92653266+LangLangBart@users.noreply.github.com> | 2025-07-25 10:33:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-25 17:33:18 +0900 |
| commit | 354d0468c126c4e03b3578a752afedfd6451fd0d (patch) | |
| tree | 032f516128c840ce2d3afa99c7c62ed9622c6f10 | |
| parent | 4efcc344c35e8bb7e6ba7bb23e5885051420b361 (diff) | |
| download | fzf-354d0468c126c4e03b3578a752afedfd6451fd0d.tar.gz | |
fix(shell): check for mawk existence before version check (#4468)
close #4463
| -rw-r--r-- | shell/common.sh | 4 | ||||
| -rw-r--r-- | shell/completion.bash | 6 | ||||
| -rw-r--r-- | shell/completion.zsh | 4 | ||||
| -rw-r--r-- | shell/key-bindings.bash | 4 | ||||
| -rw-r--r-- | shell/key-bindings.zsh | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/shell/common.sh b/shell/common.sh index 6866f0be..ab4b3d70 100644 --- a/shell/common.sh +++ b/shell/common.sh @@ -22,11 +22,11 @@ __fzf_exec_awk() { # modern point of view. To use a standard-conforming version in Solaris, # one needs to explicitly use /usr/xpg4/bin/awk. __fzf_awk=/usr/xpg4/bin/awk - else + elif command -v mawk >/dev/null 2>&1; then # choose the faster mawk if: it's installed && build date >= 20230322 && # version >= 1.3.4 local n x y z d - IFS=' .' read n x y z d <<< $(command mawk -W version 2> /dev/null) + IFS=' .' read -r n x y z d <<< $(command mawk -W version 2> /dev/null) [[ $n == mawk ]] && (( d >= 20230302 && (x * 1000 + y) * 1000 + z >= 1003004 )) && __fzf_awk=mawk fi fi diff --git a/shell/completion.bash b/shell/completion.bash index c3121ecc..965bdb40 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -47,9 +47,9 @@ __fzf_exec_awk() { __fzf_awk=awk if [[ $OSTYPE == solaris* && -x /usr/xpg4/bin/awk ]]; then __fzf_awk=/usr/xpg4/bin/awk - else + elif command -v mawk >/dev/null 2>&1; then local n x y z d - IFS=' .' read n x y z d <<< $(command mawk -W version 2> /dev/null) + IFS=' .' read -r n x y z d <<< $(command mawk -W version 2> /dev/null) [[ $n == mawk ]] && (( d >= 20230302 && (x * 1000 + y) * 1000 + z >= 1003004 )) && __fzf_awk=mawk fi fi @@ -524,7 +524,7 @@ if ! declare -F __fzf_list_hosts > /dev/null; then if ($i != "0.0.0.0") print $i } - ' /etc/hosts 2> /dev/null + ' /etc/hosts 2> /dev/null ) } fi diff --git a/shell/completion.zsh b/shell/completion.zsh index b9f9baa0..1df53f55 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -112,9 +112,9 @@ __fzf_exec_awk() { __fzf_awk=awk if [[ $OSTYPE == solaris* && -x /usr/xpg4/bin/awk ]]; then __fzf_awk=/usr/xpg4/bin/awk - else + elif command -v mawk >/dev/null 2>&1; then local n x y z d - IFS=' .' read n x y z d <<< $(command mawk -W version 2> /dev/null) + IFS=' .' read -r n x y z d <<< $(command mawk -W version 2> /dev/null) [[ $n == mawk ]] && (( d >= 20230302 && (x * 1000 + y) * 1000 + z >= 1003004 )) && __fzf_awk=mawk fi fi diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index a1d4fa23..50edecef 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -33,9 +33,9 @@ __fzf_exec_awk() { __fzf_awk=awk if [[ $OSTYPE == solaris* && -x /usr/xpg4/bin/awk ]]; then __fzf_awk=/usr/xpg4/bin/awk - else + elif command -v mawk >/dev/null 2>&1; then local n x y z d - IFS=' .' read n x y z d <<< $(command mawk -W version 2> /dev/null) + IFS=' .' read -r n x y z d <<< $(command mawk -W version 2> /dev/null) [[ $n == mawk ]] && (( d >= 20230302 && (x * 1000 + y) * 1000 + z >= 1003004 )) && __fzf_awk=mawk fi fi diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index b2fc198c..46b3c2b0 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -54,9 +54,9 @@ __fzf_exec_awk() { __fzf_awk=awk if [[ $OSTYPE == solaris* && -x /usr/xpg4/bin/awk ]]; then __fzf_awk=/usr/xpg4/bin/awk - else + elif command -v mawk >/dev/null 2>&1; then local n x y z d - IFS=' .' read n x y z d <<< $(command mawk -W version 2> /dev/null) + IFS=' .' read -r n x y z d <<< $(command mawk -W version 2> /dev/null) [[ $n == mawk ]] && (( d >= 20230302 && (x * 1000 + y) * 1000 + z >= 1003004 )) && __fzf_awk=mawk fi fi |