diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2024-04-10 00:46:09 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2024-04-10 00:46:09 +0900 |
| commit | 152988c17bd6c35ce55652d123db8b65a32f98e4 (patch) | |
| tree | c4608597a1b9b396277255d379bd1a17a93de107 /shell | |
| parent | 4cd37fc02b4491d4c9a5f6a27ad41895ad1a62cc (diff) | |
| download | fzf-152988c17bd6c35ce55652d123db8b65a32f98e4.tar.gz | |
[shell] Revert interactiveness checks for eval
So that there's no error even when the scripts are mistakenly evaluated
in non-interactive sessions.
bash -c 'eval "$(fzf --bash)"; echo done'
zsh -c 'eval "$(fzf --zsh)"; echo done'
* https://github.com/junegunn/fzf/pull/3675#issuecomment-2044860901
* https://github.com/junegunn/fzf/commit/f103aa4753b435f8f45c5130323effeb75583c15
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/completion.bash | 4 | ||||
| -rw-r--r-- | shell/completion.zsh | 4 | ||||
| -rw-r--r-- | shell/key-bindings.bash | 4 | ||||
| -rw-r--r-- | shell/key-bindings.zsh | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/shell/completion.bash b/shell/completion.bash index 3d3349e3..5786d046 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -9,7 +9,7 @@ # - $FZF_COMPLETION_TRIGGER (default: '**') # - $FZF_COMPLETION_OPTS (default: empty) -[[ $- =~ i ]] || return 0 +if [[ $- =~ i ]]; then # To use custom commands instead of find, override _fzf_compgen_{path,dir} @@ -581,3 +581,5 @@ _fzf_setup_completion 'var' export unset printenv _fzf_setup_completion 'alias' unalias _fzf_setup_completion 'host' telnet _fzf_setup_completion 'proc' kill + +fi diff --git a/shell/completion.zsh b/shell/completion.zsh index 163b0299..7067b06f 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -9,7 +9,7 @@ # - $FZF_COMPLETION_TRIGGER (default: '**') # - $FZF_COMPLETION_OPTS (default: empty) -[[ -o interactive ]] || return 0 +if [[ -o interactive ]]; then # Both branches of the following `if` do the same thing -- define @@ -351,3 +351,5 @@ bindkey '^I' fzf-completion eval $__fzf_completion_options 'unset' '__fzf_completion_options' } + +fi diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index b132b179..9a3dff71 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -11,7 +11,7 @@ # - $FZF_ALT_C_COMMAND # - $FZF_ALT_C_OPTS -[[ $- =~ i ]] || return 0 +if [[ $- =~ i ]]; then # Key bindings @@ -132,3 +132,5 @@ if [[ "${FZF_ALT_C_COMMAND-x}" != "" ]]; then bind -m vi-command '"\ec": "\C-z\ec\C-z"' bind -m vi-insert '"\ec": "\C-z\ec\C-z"' fi + +fi diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index 3614dd43..a75f4beb 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -11,7 +11,7 @@ # - $FZF_ALT_C_COMMAND # - $FZF_ALT_C_OPTS -[[ -o interactive ]] || return 0 +if [[ -o interactive ]]; then # Key bindings @@ -119,3 +119,5 @@ bindkey -M viins '^R' fzf-history-widget eval $__fzf_key_bindings_options 'unset' '__fzf_key_bindings_options' } + +fi |