This commit is contained in:
fatalerrors
2026-04-15 15:39:45 +02:00
parent dfad345be3
commit 5300386941

View File

@@ -284,32 +284,33 @@ set_prompt()
local _user_fg="${PROMPT_COLOR_USER_FG:-$Green}" local _user_fg="${PROMPT_COLOR_USER_FG:-$Green}"
local _dir_fg="${PROMPT_COLOR_DIR_FG:-$ICyan}" local _dir_fg="${PROMPT_COLOR_DIR_FG:-$ICyan}"
# Begin with time # Begin with time (cursor-save is non-printing; all ANSI sequences wrapped
PS1="\[\e[s${_time_fg}${_time_bg} [ \t ] ${_bar_bg}" # in \[...\] so bash does not count them toward the visible line width)
PS1="\[\e[s\]\[${_time_fg}${_time_bg}\] [ \t ] \[${_bar_bg}\]"
# Add exit status of the last command. # Add exit status of the last command.
# If it was successful, print a green check mark. Otherwise, print a red X. # If it was successful, print a green check mark. Otherwise, print a red X.
if [[ $Last_Command == 0 ]]; then if [[ $Last_Command == 0 ]]; then
PS1+="${_ok_fg}${_bar_bg} [ \$Last_Command " PS1+="\[${_ok_fg}${_bar_bg}\] [ \$Last_Command "
PS1+="${_ok_mark}${Checkmark} " PS1+="\[${_ok_mark}\]${Checkmark}\[${_bar_bg}\] "
else else
PS1+="${_err_fg}${_err_bg} [ \$Last_Command " PS1+="\[${_err_fg}${_err_bg}\] [ \$Last_Command "
PS1+="${_err_mark}${FancyX} " PS1+="\[${_err_mark}\]${FancyX}\[${_err_bg}\] "
fi fi
# Add the elapsed time # Add the elapsed time
timer_stop timer_stop
PS1+="($timer_show)${_ok_fg} ] ${_bar_bg} " PS1+="($timer_show)\[${_ok_fg}\] ] \[${_bar_bg}\] "
# If root, print the host in root colour. Otherwise use user colour. # If root, print the host in root colour. Otherwise use user colour.
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
PS1+="${_root_fg}\\u${_user_fg}@\\h" PS1+="\[${_root_fg}\]\\u\[${_user_fg}\]@\\h"
else else
PS1+="${_user_fg}\\u@\\h" PS1+="\[${_user_fg}\]\\u@\\h"
fi fi
PS1+="\e[K\e[u$DEFAULTCOL\n" PS1+="\[\e[K\e[u\]\[$DEFAULTCOL\]\n"
# Print the working directory and prompt marker, then reset colour. # Print the working directory and prompt marker, then reset colour.
PS1+="${_dir_fg}\\w \\\$$DEFAULTCOL " PS1+="\[${_dir_fg}\]\\w \\\$\[$DEFAULTCOL\] "
} }
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------