mirror of
https://github.com/dustinkirkland/byobu
synced 2025-07-05 20:42:10 -07:00
add a bash timer, that shows the runtime of the previous command
+ at the beginning of the prompt
This commit is contained in:
Dustin Kirkland
parent
e9c1ff5c37
commit
0603036501
3 changed files with 48 additions and 7 deletions
5
debian/changelog
vendored
5
debian/changelog
vendored
|
|
@ -4,8 +4,11 @@ byobu (6.6) unreleased; urgency=medium
|
|||
- export PS1
|
||||
* usr/bin/byobu-janitor.in:
|
||||
- add byobu prompt to .bashrc in Wolfi
|
||||
* usr/share/byobu/profiles/bashrc, usr/share/man/man1/byobu-prompt.1:
|
||||
- add a bash timer, that shows the runtime of the previous command
|
||||
at the beginning of the prompt
|
||||
|
||||
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 16 Jan 2024 19:14:10 -0600
|
||||
-- Dustin Kirkland <kirkland@ubuntu.com> Tue, 16 Jan 2024 20:10:22 -0600
|
||||
|
||||
byobu (6.5) released; urgency=medium
|
||||
|
||||
|
|
|
|||
|
|
@ -27,10 +27,48 @@ esac
|
|||
[ -z "$USER" ] && export USER=$(whoami)
|
||||
byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e " $e "; }
|
||||
byobu_prompt_symbol() { [ "$USER" = "root" ] && printf "%s" "#" || printf "%s" "\$"; }
|
||||
byobu_prompt_runtime() {
|
||||
# Calculate the approximate runtime of the previous command
|
||||
# Uses bash 5.0's EPOCHREALTIME
|
||||
local starttime endtime duration days hours minutes seconds microseconds nanoseconds str
|
||||
[ ! -r $BYOBU_RUN_DIR/timer.$$ ] && printf "[0.000s]" && return
|
||||
read starttime < $BYOBU_RUN_DIR/timer.$$ 2>/dev/null || true
|
||||
endtime=${EPOCHREALTIME/./}
|
||||
starttime=${starttime/./}
|
||||
duration=$((endtime - starttime))
|
||||
days=$((duration/1000000/60/60/24))
|
||||
hours=$((duration/1000000/60/60%24))
|
||||
minutes=$((duration/1000000/60%60))
|
||||
seconds=$((duration/1000000%60))
|
||||
nanoseconds=$((duration-days*1000000*60*60*24-hours*1000000*60*60-minutes*1000000*60-seconds*1000000))
|
||||
nanoseconds=$(printf "%.6d" ${nanoseconds})
|
||||
microseconds=${nanoseconds:0:3}
|
||||
# Shorten our string as much as possible
|
||||
if [ "$days" = "0" ]; then
|
||||
days=
|
||||
if [ "$hours" = "0" ]; then
|
||||
hours=
|
||||
if [ "$minutes" = "0" ]; then
|
||||
minutes=
|
||||
else
|
||||
minutes="${minutes}m "
|
||||
fi
|
||||
else
|
||||
hours="${hours}h "
|
||||
fi
|
||||
else
|
||||
days="${days}d "
|
||||
fi
|
||||
str="${days}${hours}${minutes}${seconds}.${microseconds}s"
|
||||
printf "[%s]" "$str" 1>&2
|
||||
}
|
||||
# Requires Bash 4.x
|
||||
export PS0='$(printf "%s" ${EPOCHREALTIME/./} >"$BYOBU_RUN_DIR/timer.$$")'
|
||||
|
||||
case "$BYOBU_DISTRO" in
|
||||
"Ubuntu")
|
||||
# Use Ubuntu colors (grey / orange / aubergine)
|
||||
export PS1="${debian_chroot:+($debian_chroot)}\[\e[38;5;202m\]\$(byobu_prompt_status)\[\e[38;5;245m\]\u\[\e[00m\]@\[\e[38;5;172m\]\h\[\e[00m\]:\[\e[38;5;5m\]\w\[\e[00m\]\$(byobu_prompt_symbol) "
|
||||
export PS1="${debian_chroot:+($debian_chroot)}\[\e[38;5;202m\]\$(byobu_prompt_status)\[\e[00m\]\$(byobu_prompt_runtime) \[\e[38;5;245m\]\u\[\e[00m\]@\[\e[38;5;172m\]\h\[\e[00m\]:\[\e[38;5;5m\]\w\[\e[00m\]\$(byobu_prompt_symbol) "
|
||||
export GREP_COLORS="ms=01;38;5;202:mc=01;31:sl=:cx=:fn=01;38;5;132:ln=32:bn=32:se=00;38;5;242"
|
||||
export LESS_TERMCAP_mb=$(printf '\e[01;31m') # enter blinking mode – red
|
||||
export LESS_TERMCAP_md=$(printf '\e[01;38;5;180m') # enter double-bright mode – bold light orange
|
||||
|
|
@ -50,10 +88,10 @@ case "$BYOBU_DISTRO" in
|
|||
# For reference: https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg
|
||||
# Convert hex to 256: https://gist.githubusercontent.com/MicahElliott/719710/raw/73d047f0a3ffc35f0655488547e7f24fa3f04ea6/colortrans.py
|
||||
# Use Wolfi colors (pink=170 / purple=98 / blue=63); flashing error code on previous command non-zero exit
|
||||
export PS1="\[\e[03;5;15;54m\]\$(byobu_prompt_status)\[\e[00m\]\[\e[38;5;170m\]\u\[\e[00m\]@\[\e[38;5;98m\]\h\[\e[00m\]:\[\e[38;5;63m\]\w\[\e[00m\]\$(byobu_prompt_symbol) "
|
||||
PS1="\[\e[03;5;15;54m\]\$(byobu_prompt_status)\[\e[00m\]\$(byobu_prompt_runtime) \[\e[38;5;170m\]\u\[\e[00m\]@\[\e[38;5;98m\]\h\[\e[00m\]:\[\e[38;5;63m\]\w\[\e[00m\]\$(byobu_prompt_symbol) "
|
||||
;;
|
||||
*)
|
||||
# Use Googley colors (blue / red / yellow / blue / green / red )
|
||||
export PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[38;5;69m\]\u\[\e[38;5;214m\]@\[\e[38;5;167m\]\h\[\e[38;5;214m\]:\[\e[38;5;71m\]\w\[\e[38;5;214m\]\$(byobu_prompt_symbol)\[\e[00m\] "
|
||||
PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[38;5;69m\]\u\[\e[38;5;214m\]@\[\e[38;5;167m\]\h\[\e[38;5;214m\]:\[\e[38;5;71m\]\w\[\e[38;5;214m\]\$(byobu_prompt_symbol)\[\e[00m\] "
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
.TH byobu-prompt 1 "26 July 2013" byobu "byobu"
|
||||
.TH byobu-prompt 1 "16 January 2024" byobu "byobu"
|
||||
.SH NAME
|
||||
byobu-prompt, byobu-enable-prompt, byobu-disable-prompt \- add and remove a nice color prompt to your shell configuration
|
||||
byobu-prompt, byobu-enable-prompt, byobu-disable-prompt \- add and remove a nice color prompt with a previous command timer to your shell configuration
|
||||
|
||||
.SH SYNOPSIS
|
||||
\fBbyobu-prompt\fP
|
||||
|
|
@ -11,7 +11,7 @@ byobu-prompt, byobu-enable-prompt, byobu-disable-prompt \- add and remove a nice
|
|||
|
||||
.SH DESCRIPTION
|
||||
|
||||
Byobu provides a special PS1 prompt command, compatible with Bash shells. It will display the previous command's exit code, if it's not zero. It will use 3 separate colors for the local username, hostname, and the current working directory.
|
||||
Byobu provides a special PS0 and PS1 prompt command, compatible with Bash shells. It will display the previous command's total runtime and exit code, if it's not zero. It will use 3 separate colors for the local username, hostname, and the current working directory.
|
||||
|
||||
\fBbyobu-enable-prompt\fP will add one line to your \fI~/.bashrc\fP.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue