diff options
| author | Koichi Murase <myoga.murase@gmail.com> | 2024-01-08 01:38:51 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 16:38:51 +0000 |
| commit | 31c6ec0be5048a70baf598ab54a049da5e4d5afa (patch) | |
| tree | 9bae1e47cffd2ba1a112393907fdc196cea31160 | |
| parent | refactor: String -> HistoryId (#1512) (diff) | |
| download | atuin-31c6ec0be5048a70baf598ab54a049da5e4d5afa.zip | |
fix(bash): work around custom IFS (#1514)
When the user sets a custom value of IFS, the up keybinding may fail
because the option `--shell-up-key-binding` passed to
`__atuin_history` is broken by the word splitting of the shell. For
example, when the user sets IFS=-, `atuin` called from __atuin_history
receives `shell up key binding <content>` as the search string.
$ IFS=-
$ echo [up] # <-- this does not work as expected
Note that the problem only happens with the plain Bash without ble.sh.
The problem does not arise within ble.sh because ble.sh separates the
user environment and the line-editor environment by saving/restoring
the shell settings. The keybindings are processed in the line-editor
environment, so the custom IFS set by the user does not affect it.
In this patch, we properly quote the arguments to the atuin command.
| -rw-r--r-- | atuin/src/shell/atuin.bash | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/atuin/src/shell/atuin.bash b/atuin/src/shell/atuin.bash index 295ef268..cf68c854 100644 --- a/atuin/src/shell/atuin.bash +++ b/atuin/src/shell/atuin.bash @@ -113,8 +113,7 @@ __atuin_accept_line() { } __atuin_history() { - # shellcheck disable=SC2048,SC2086 - HISTORY="$(ATUIN_SHELL_BASH=t ATUIN_LOG=error atuin search $* -i -- "${READLINE_LINE}" 3>&1 1>&2 2>&3)" + HISTORY="$(ATUIN_SHELL_BASH=t ATUIN_LOG=error atuin search "$@" -i -- "${READLINE_LINE}" 3>&1 1>&2 2>&3)" # We do nothing when the search is canceled. [[ $HISTORY ]] || return 0 |