From e0ba60fc3c4d72d785a13eea5718b91559fd218d Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 7 Jun 2022 14:28:06 -0700 Subject: [PATCH] Enhancements to bash init script (#445) --- src/shell/atuin.bash | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/shell/atuin.bash b/src/shell/atuin.bash index 6295a4e4..3d86497b 100644 --- a/src/shell/atuin.bash +++ b/src/shell/atuin.bash @@ -2,8 +2,8 @@ ATUIN_SESSION=$(atuin uuid) export ATUIN_SESSION _atuin_preexec() { - local id; id=$(atuin history start "$1") - export ATUIN_HISTORY_ID="$id" + local id; id=$(atuin history start "$1") + export ATUIN_HISTORY_ID="${id}" } _atuin_precmd() { @@ -11,21 +11,19 @@ _atuin_precmd() { [[ -z "${ATUIN_HISTORY_ID}" ]] && return - (RUST_LOG=error atuin history end "$ATUIN_HISTORY_ID" --exit $EXIT &) > /dev/null 2>&1 + (RUST_LOG=error atuin history end "${ATUIN_HISTORY_ID}" --exit "${EXIT}" &) > /dev/null 2>&1 } - __atuin_history () { tput rmkx - HISTORY="$(RUST_LOG=error atuin search -i "$BUFFER" 3>&1 1>&2 2>&3)" + HISTORY="$(RUST_LOG=error atuin search -i "${READLINE_LINE}" 3>&1 1>&2 2>&3)" tput smkx READLINE_LINE=${HISTORY} READLINE_POINT=${#READLINE_LINE} } - if [[ -n "${BLE_VERSION-}" ]]; then blehook PRECMD-+=_atuin_precmd blehook PREEXEC-+=_atuin_preexec @@ -34,6 +32,8 @@ else preexec_functions+=(_atuin_preexec) fi -if [[ -z $ATUIN_NOBIND ]]; then +if [[ -z ${ATUIN_NOBIND} ]]; then bind -x '"\C-r": __atuin_history' + bind -x '"\e[A": __atuin_history' + bind -x '"\eOA": __atuin_history' fi