Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bash): fix small issues of enter_accept for the plain Bash #1467

Merged
merged 5 commits into from
Jan 1, 2024
Merged

fix(bash): fix small issues of enter_accept for the plain Bash #1467

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
598d453
fix(bash): history should be updated before preexec
akinomyoga Dec 26, 2023
4b2fb59
fix(bash): properly execute "--"
akinomyoga Dec 26, 2023
70cf7fb
fix(bash): correctly restore $? and $_
akinomyoga Dec 26, 2023
62fe709
fix(bash): fix the use of preexec_ret_value
akinomyoga Dec 26, 2023
8950328
feat(bash): support array PROMPT_COMMAND of Bash >= 5.1
akinomyoga Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions atuin/src/shell/atuin.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ __atuin_history() {
fi
echo "${PS1@P}$HISTORY"

# Add it to the bash history
history -s "$HISTORY"

# Assuming bash-preexec
# Invoke every function in the preexec array
local preexec_function
Expand All @@ -56,31 +59,36 @@ __atuin_history() {
fi
fi
done
# shellcheck disable=SC2154
__atuin_set_ret_value "$preexec_ret_value" "$__bp_last_argument_prev_command"

# Juggle the terminal settings so that the command can be interacted with
local stty_backup
stty_backup=$(stty -g)
stty "$ATUIN_STTY"
# If extdebug is turned on and any preexec function returns non-zero
# exit status, we do not run the user command.
if ! { shopt -q extdebug && ((preexec_ret_value)); }; then
# Juggle the terminal settings so that the command can be interacted with
local stty_backup
stty_backup=$(stty -g)
stty "$ATUIN_STTY"

eval "$HISTORY"
exit_status=$?
# Execute the command. Note: We need to record $? and $_ after the
# user command within the same call of "eval" because $_ is otherwise
# overwritten by the last argument of "eval".
__atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
eval -- "$HISTORY"$'\n__bp_last_ret_value=$? __bp_last_argument_prev_command=$_'

stty "$stty_backup"
stty "$stty_backup"
fi

# Execute preprompt commands
__atuin_set_ret_value "$exit_status" "$HISTORY"
eval "$PROMPT_COMMAND"
# Add it to the bash history
history -s "$HISTORY"
local __atuin_prompt_command
for __atuin_prompt_command in "${PROMPT_COMMAND[@]}"; do
__atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
eval -- "$__atuin_prompt_command"
done
# Bash will redraw only the line with the prompt after we finish,
# so to work for a multiline prompt we need to print it ourselves,
# then move up a line
__atuin_set_ret_value "$exit_status" "$HISTORY"
__atuin_set_ret_value "${__bp_last_ret_value-}" "${__bp_last_argument_prev_command-}"
echo "${PS1@P}"
tput cuu 1
__atuin_set_ret_value "$exit_status" "$HISTORY"
fi

READLINE_LINE=""
Expand Down