From bfa287b66ddd5282e1f778936d64cc8454794d19 Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Fri, 6 Jun 2025 20:08:03 +0900 Subject: [bash,zsh] Separate common functions into "shell/common.sh" --- shell/completion.bash | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'shell/completion.bash') diff --git a/shell/completion.bash b/shell/completion.bash index 2132ffd1..aef79060 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -31,47 +31,31 @@ if [[ $- =~ i ]]; then ########################################################### +#----BEGIN INCLUDE common.sh +# NOTE: Do not directly edit this section, which is copied from "common.sh". +# To modify it, one can edit "common.sh" and run "./update-common.sh" to apply +# the changes. See code comments in "common.sh" for the implementation details. + __fzf_defaults() { - # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS - # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS - echo "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1" + printf '%s\n' "--height ${FZF_TMUX_HEIGHT:-40%} --min-height 20+ --bind=ctrl-z:ignore $1" command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null - echo "${FZF_DEFAULT_OPTS-} $2" + printf '%s\n' "${FZF_DEFAULT_OPTS-} $2" } -# This function performs `exec awk "$@"` safely by working around awk -# compatibility issues. -# -# Note: To reduce an extra fork, this function performs "exec" so is expected -# to be run as the last command in a subshell. -# -# Note: This function is included with {completion,key-bindings}.{bash,zsh} and -# synchronized. __fzf_exec_awk() { if [[ -z ${__fzf_awk-} ]]; then __fzf_awk=awk if [[ $OSTYPE == solaris* && -x /usr/xpg4/bin/awk ]]; then - # Note: Solaris awk at /usr/bin/awk is meant for backward compatibility - # with an ancient implementation of 1977 awk in the original UNIX. It - # lacks many features of POSIX awk, so it is essentially useless in the - # 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 - # 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) [[ $n == mawk ]] && (( d >= 20230302 && (x * 1000 + y) * 1000 + z >= 1003004 )) && __fzf_awk=mawk fi fi - - # Note: macOS awk has a quirk that it stops processing at all when it sees - # any data not following UTF-8 in the input stream when the current LC_CTYPE - # specifies the UTF-8 encoding. To work around this quirk, one needs to - # specify LC_ALL=C to change the current encoding to the plain one. LC_ALL=C exec "$__fzf_awk" "$@" } +#----END INCLUDE __fzf_comprun() { if [[ "$(type -t _fzf_comprun 2>&1)" = function ]]; then -- cgit v1.2.3