Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[shell] improve mawk detection #3463

Merged
merged 6 commits into from
Oct 7, 2023
Merged

[shell] improve mawk detection #3463

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5d3852
[shell] improve mawk detection
step- Oct 6, 2023
4a797e8
replace x with redirection to /dev/null
step- Oct 7, 2023
614af52
Update shell/key-bindings.bash
junegunn Oct 7, 2023
c7e1f0b
Update shell/key-bindings.bash
junegunn Oct 7, 2023
09dd8af
Update shell/key-bindings.bash
junegunn Oct 7, 2023
3462876
Apply suggestions from code review
junegunn Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions shell/key-bindings.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if command -v perl > /dev/null; then
output=$(
set +o pipefail
builtin fc -lnr -2147483648 |
last_hist=$(HISTTIMEFORMAT='' builtin history 1) perl -n -l0 -e "$script" |
last_hist=$(HISTTIMEFORMAT='' builtin history 1) command perl -n -l0 -e "$script" |
FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) --query "$READLINE_LINE"
) || return
READLINE_LINE=${output#*$'\t'}
Expand All @@ -66,16 +66,14 @@ if command -v perl > /dev/null; then
READLINE_POINT=0x7fffffff
fi
}
else # awk
else # awk - fallback for POSIX systems
__fzf_history__() {
local output opts script
local output opts script n x y z d
if [[ -z $__fzf_awk ]]; then
__fzf_awk=awk
# if installed, mawk is faster
command -v mawk > /dev/null &&
mawk --version | # at least 1.3.4
awk 'NR == 1 { split($2, a, "."); v=(a[1]*1000000+ a[2]*1000+ a[3]*1); exit !(v >= 1003004) }' &&
__fzf_awk=mawk
# choose the faster mawk if: it's installed && build date >= 20230322 && version >= 1.3.4
IFS=' .' read 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
opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0"
[[ $(HISTTIMEFORMAT='' builtin history 1) =~ [[:digit:]]+ ]] # how many history entries
Expand All @@ -87,7 +85,7 @@ else # awk
output=$(
set +o pipefail
builtin fc -lnr -2147483648 2> /dev/null | # ( $'\t '<lines>$'\n' )* ; <lines> ::= [^\n]* ( $'\n'<lines> )*
$__fzf_awk "$script" | # ( <counter>$'\t'<lines>$'\000' )*
command $__fzf_awk "$script" | # ( <counter>$'\t'<lines>$'\000' )*
FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) --query "$READLINE_LINE"
) || return
READLINE_LINE=${output#*$'\t'}
Expand Down