Revert "Revert "fix(bash): avoid unexpected atuin history start for keybind…" (#1728)

This reverts commit 032ca19c73.
This commit is contained in:
Ellie Huxtable 2024-02-17 10:50:19 +00:00 committed by GitHub
parent 032ca19c73
commit 07f363ba3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -17,6 +17,14 @@ export ATUIN_SESSION
ATUIN_HISTORY_ID="" ATUIN_HISTORY_ID=""
__atuin_preexec() { __atuin_preexec() {
if [[ ! ${BLE_ATTACHED-} ]]; then
# With bash-preexec, preexec may be called even for the command run by
# keybindings. There is no general and robust way to detect the
# command for keybindings, but at least we want to exclude Atuin's
# keybindings.
[[ $BASH_COMMAND == '__atuin_history'* && $BASH_COMMAND != "$1" ]] && return 0
fi
local id local id
id=$(atuin history start -- "$1") id=$(atuin history start -- "$1")
export ATUIN_HISTORY_ID=$id export ATUIN_HISTORY_ID=$id