From d670c335540e035d128cd6a9d5495f677a16d367 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 16 Jan 2024 13:04:42 -0600 Subject: [PATCH 01/25] export PS1 + + --- debian/changelog | 9 ++++++++- usr/share/byobu/profiles/bashrc | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4d053b26..a41d22f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +byobu (6.6) jammy; urgency=medium + + * usr/share/byobu/profiles/bashrc: + - export PS1 + + -- Dustin Kirkland Tue, 16 Jan 2024 13:04:22 -0600 + byobu (6.5) released; urgency=medium * usr/share/byobu/profiles/bashrc: @@ -6,7 +13,7 @@ byobu (6.5) released; urgency=medium * usr/bin/byobu-shell.in: - need a -l login shell to source profiles and colorize PS1 - -- Dustin Kirkland Tue, 09 Jan 2024 07:32:57 -0600 + -- Dustin Kirkland Tue, 16 Jan 2024 13:04:06 -0600 byobu (6.4) released; urgency=medium diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index de7a8177..48b8487d 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -30,7 +30,7 @@ byobu_prompt_symbol() { [ "$USER" = "root" ] && printf "%s" "#" || printf "%s" " case "$BYOBU_DISTRO" in "Ubuntu") # Use Ubuntu colors (grey / orange / aubergine) - 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[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 +50,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 - 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) " + 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) " ;; *) # Use Googley colors (blue / red / yellow / blue / green / red ) - 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\] " + 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\] " ;; esac From e9c1ff5c37c950c3860caf38815ff246e4a2b5eb Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 16 Jan 2024 19:14:44 -0600 Subject: [PATCH 02/25] add byobu prompt to .bashrc in Wolfi --- debian/changelog | 6 ++++-- usr/bin/byobu-janitor.in | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a41d22f7..905cc4a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -byobu (6.6) jammy; urgency=medium +byobu (6.6) unreleased; urgency=medium * usr/share/byobu/profiles/bashrc: - export PS1 + * usr/bin/byobu-janitor.in: + - add byobu prompt to .bashrc in Wolfi - -- Dustin Kirkland Tue, 16 Jan 2024 13:04:22 -0600 + -- Dustin Kirkland Tue, 16 Jan 2024 19:14:10 -0600 byobu (6.5) released; urgency=medium diff --git a/usr/bin/byobu-janitor.in b/usr/bin/byobu-janitor.in index b35a00d6..30e03f5d 100755 --- a/usr/bin/byobu-janitor.in +++ b/usr/bin/byobu-janitor.in @@ -142,6 +142,10 @@ if [ "$BYOBU_DISTRO" = "Wolfi" ]; then if ! (grep -qs "#byobu-prompt#$" "$HOME/.profile"); then printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.profile" fi + # Wolfi also has bash, which uses .bashrc + if ! (grep -qs "#byobu-prompt#$" "$HOME/.bashrc"); then + printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt #byobu-prompt#\n" >> "$HOME/.bashrc" + fi fi # Affects: Upgrades from <= byobu 5.126, clear out ec2/rcs cost statuses From 060303650183ff36b5f0798b547fd66342daff15 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 16 Jan 2024 20:10:53 -0600 Subject: [PATCH 03/25] add a bash timer, that shows the runtime of the previous command + at the beginning of the prompt --- debian/changelog | 5 +++- usr/share/byobu/profiles/bashrc | 44 ++++++++++++++++++++++++++++--- usr/share/man/man1/byobu-prompt.1 | 6 ++--- 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 905cc4a6..6e99e9fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 16 Jan 2024 19:14:10 -0600 + -- Dustin Kirkland Tue, 16 Jan 2024 20:10:22 -0600 byobu (6.5) released; urgency=medium diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index 48b8487d..a319ed15 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -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 diff --git a/usr/share/man/man1/byobu-prompt.1 b/usr/share/man/man1/byobu-prompt.1 index 1e0e36fd..2ad80c31 100644 --- a/usr/share/man/man1/byobu-prompt.1 +++ b/usr/share/man/man1/byobu-prompt.1 @@ -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. From 03a0ccea030196f471e9a2df9181cb544c2464a6 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 16 Jan 2024 20:11:20 -0600 Subject: [PATCH 04/25] releasing 6.6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e99e9fd..792e0528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -byobu (6.6) unreleased; urgency=medium +byobu (6.6) released; urgency=medium * usr/share/byobu/profiles/bashrc: - export PS1 @@ -8,7 +8,7 @@ byobu (6.6) unreleased; urgency=medium - add a bash timer, that shows the runtime of the previous command at the beginning of the prompt - -- Dustin Kirkland Tue, 16 Jan 2024 20:10:22 -0600 + -- Dustin Kirkland Tue, 16 Jan 2024 20:11:10 -0600 byobu (6.5) released; urgency=medium From 3f60f2527cb5947813c2ab84471772713f28dc5e Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 20 Jan 2024 20:50:42 -0600 Subject: [PATCH 05/25] if we're in a busybox/ash shell, but real bash is available, use bash + + --- debian/changelog | 7 +++++++ usr/bin/byobu.in | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 792e0528..ccb43187 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +byobu (6.7) unreleased; urgency=medium + + * usr/bin/byobu.in: + - if we're in a busybox/ash shell, but real bash is available, use bash + + -- Dustin Kirkland Sat, 20 Jan 2024 20:49:21 -0600 + byobu (6.6) released; urgency=medium * usr/share/byobu/profiles/bashrc: diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index b3616a4e..870191f0 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -2,7 +2,7 @@ # # byobu - wrapper script # Copyright (C) 2008-2009 Canonical Ltd. -# Copyright (C) 2008-2014 Dustin Kirkland +# Copyright (C) 2008-2024 Dustin Kirkland # # Authors: Dustin Kirkland # @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=5.134 +VERSION=6.7 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. @@ -32,6 +32,13 @@ if [ ! -O "$HOME" ]; then exit 1 fi +# If we're in a busybox/ash shell (or shell is undefined), +# and a full bash shell is available, then please let's use bash in byobu. +# Other shells are supported, but your mileage may vary... +if [ "$SHELL" = "/bin/ash" ] || [ "$SHELL" = "ash" ] || [ -z "$SHELL" ]; then + [ -x "/bin/bash" ] && export SHELL="/bin/bash" +fi + # Source local byobu config if [ -r "$HOME/.byoburc" ]; then # Ensure that this configuration is usable From cf44bfc8953fb179f873c4d6904f2e7669648a4f Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 20 Jan 2024 21:16:06 -0600 Subject: [PATCH 06/25] releasing 6.7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccb43187..ab0f21ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -byobu (6.7) unreleased; urgency=medium +byobu (6.7) released; urgency=medium * usr/bin/byobu.in: - if we're in a busybox/ash shell, but real bash is available, use bash - -- Dustin Kirkland Sat, 20 Jan 2024 20:49:21 -0600 + -- Dustin Kirkland Sat, 20 Jan 2024 21:15:53 -0600 byobu (6.6) released; urgency=medium From bbded71918c4e47f5bc650f03b3a57402ccb93f8 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 20 Jan 2024 21:28:05 -0600 Subject: [PATCH 07/25] have F1 pull up the keybindings text + + --- debian/changelog | 7 +++++++ usr/share/byobu/keybindings/f-keys.tmux | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab0f21ce..82a2aace 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +byobu (6.8) jammy; urgency=medium + + * usr/share/byobu/keybindings/f-keys.tmux: + - have F1 pull up the keybindings text + + -- Dustin Kirkland Sat, 20 Jan 2024 21:27:37 -0600 + byobu (6.7) released; urgency=medium * usr/bin/byobu.in: diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux index 6a56aa89..fc2f4a5a 100644 --- a/usr/share/byobu/keybindings/f-keys.tmux +++ b/usr/share/byobu/keybindings/f-keys.tmux @@ -1,7 +1,7 @@ ############################################################################### # byobu's tmux f-key keybindings # -# Copyright (C) 2011-2014 Dustin Kirkland +# Copyright (C) 2011-2024 Dustin Kirkland # # Authors: Dustin Kirkland # @@ -26,7 +26,7 @@ source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux.disable # Byobu's Keybindings # Documented in: $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt -bind-key -n F1 new-window -n config byobu-config +bind-key -n F1 new-window -n help "sh -c '$BYOBU_PAGER $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt'" bind-key -n S-F1 new-window -n help "sh -c '$BYOBU_PAGER $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt'" bind-key -n F2 new-window -c "#{pane_current_path}" \; rename-window "-" bind-key -n C-F2 display-panes \; split-window -h -c "#{pane_current_path}" From 00fe8ca7e87bd3968842d0a4214e9cd49d5efe93 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jan 2024 09:03:42 -0600 Subject: [PATCH 08/25] mark unreleased --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 82a2aace..94891b9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -byobu (6.8) jammy; urgency=medium +byobu (6.8) unreleased; urgency=medium * usr/share/byobu/keybindings/f-keys.tmux: - have F1 pull up the keybindings text From 4cf9c16930148515d85f051e3d1b33078696d7f8 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jan 2024 09:26:44 -0600 Subject: [PATCH 09/25] opening 6.9 --- debian/changelog | 10 ++++++++-- usr/bin/byobu.in | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94891b9f..3ce1754b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -byobu (6.8) unreleased; urgency=medium +byobu (6.9) unreleased; urgency=medium + + * UNRELEASED + + -- Dustin Kirkland Mon, 22 Jan 2024 09:26:44 -0600 + +byobu (6.8-0ubuntu1) noble; urgency=medium * usr/share/byobu/keybindings/f-keys.tmux: - have F1 pull up the keybindings text - -- Dustin Kirkland Sat, 20 Jan 2024 21:27:37 -0600 + -- Dustin Kirkland Mon, 22 Jan 2024 09:26:40 -0600 byobu (6.7) released; urgency=medium diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index 870191f0..9a907d14 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=6.7 +VERSION=6.9 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. From 6308b188cec8eb45fa993506de784bf2dc1b8e48 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jan 2024 09:39:23 -0600 Subject: [PATCH 10/25] removing, unused, never finished --- debian/changelog | 5 +++-- snap/snapcraft.yaml | 26 -------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 snap/snapcraft.yaml diff --git a/debian/changelog b/debian/changelog index 3ce1754b..577c2b0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ byobu (6.9) unreleased; urgency=medium - * UNRELEASED + * snap: + - removing, unused, never finished - -- Dustin Kirkland Mon, 22 Jan 2024 09:26:44 -0600 + -- Dustin Kirkland Mon, 22 Jan 2024 09:38:52 -0600 byobu (6.8-0ubuntu1) noble; urgency=medium diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml deleted file mode 100644 index d973624c..00000000 --- a/snap/snapcraft.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: byobu -version: 5.124 -summary: text window manager, shell multiplexer, integrated DevOps environment -description: > - Byobu is Ubuntu's powerful text-based window manager, shell multiplexer, and - integrated DevOps environment. - Using Byobu, you can quickly create and move between different windows - over a single SSH connection or TTY terminal, split each of those windows into - multiple panes, monitor dozens of important statistics about your system, - detach and reattach to sessions later while your programs continue to run in - the background. -confinement: classic -grade: stable - -parts: - byobu: - plugin: nil - stage-packages: [byobu] - stage: - - -bin/byobu - snap: - - -bin/byobu - -apps: - byobu: - command: byobu From 7c1b47c560970b756741d121b5c637a5d64dc2cb Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jan 2024 09:45:50 -0600 Subject: [PATCH 11/25] opening 6.10 --- debian/changelog | 10 ++++++++-- usr/bin/byobu.in | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 577c2b0c..7f1b1a39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -byobu (6.9) unreleased; urgency=medium +byobu (6.10) unreleased; urgency=medium + + * UNRELEASED + + -- Dustin Kirkland Mon, 22 Jan 2024 09:45:50 -0600 + +byobu (6.9-0ubuntu1) noble; urgency=medium * snap: - removing, unused, never finished - -- Dustin Kirkland Mon, 22 Jan 2024 09:38:52 -0600 + -- Dustin Kirkland Mon, 22 Jan 2024 09:45:44 -0600 byobu (6.8-0ubuntu1) noble; urgency=medium diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index 9a907d14..6cd87853 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=6.9 +VERSION=6.10 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. From a8e7ee7cbdd7f116dc211f9008d5291826e46236 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jan 2024 10:26:02 -0600 Subject: [PATCH 12/25] bump compat, fix vcs lintian warning --- debian/changelog | 9 +++++---- debian/compat | 2 +- debian/control | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f1b1a39..551f9b50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,16 @@ -byobu (6.10) unreleased; urgency=medium +byobu (6.10) jammy; urgency=medium - * UNRELEASED + * debian/compat, debian/control: + - bump compat, fix vcs lintian warning - -- Dustin Kirkland Mon, 22 Jan 2024 09:45:50 -0600 + -- Dustin Kirkland Mon, 22 Jan 2024 10:25:40 -0600 byobu (6.9-0ubuntu1) noble; urgency=medium * snap: - removing, unused, never finished - -- Dustin Kirkland Mon, 22 Jan 2024 09:45:44 -0600 + -- Dustin Kirkland Mon, 22 Jan 2024 10:25:11 -0600 byobu (6.8-0ubuntu1) noble; urgency=medium diff --git a/debian/compat b/debian/compat index ec635144..b1bd38b6 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +13 diff --git a/debian/control b/debian/control index 856808af..cbfdd49e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Antoine Beaupré Standards-Version: 4.1.3 Build-Depends: debhelper (>= 7.0.50~), gettext-base, automake, autoconf, dh-python, python3 Homepage: https://byobu.org -Vcs-Bzr: https://github.com/dustinkirkland/byobu +Vcs-Git: https://github.com/dustinkirkland/byobu Package: byobu Architecture: all From a38bfe0925f69e9426d5fb889ad49e865c4031f9 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Mon, 22 Jan 2024 10:29:34 -0600 Subject: [PATCH 13/25] fix debhelper warnings --- debian/changelog | 6 +++--- debian/control | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 551f9b50..65facc31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -byobu (6.10) jammy; urgency=medium +byobu (6.10) unreleased; urgency=medium * debian/compat, debian/control: - - bump compat, fix vcs lintian warning + - bump compat, fix vcs lintian warning, fix debhelper warnings - -- Dustin Kirkland Mon, 22 Jan 2024 10:25:40 -0600 + -- Dustin Kirkland Mon, 22 Jan 2024 10:29:06 -0600 byobu (6.9-0ubuntu1) noble; urgency=medium diff --git a/debian/control b/debian/control index cbfdd49e..fa02a924 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Dustin Kirkland Uploaders: Antoine Beaupré Standards-Version: 4.1.3 -Build-Depends: debhelper (>= 7.0.50~), gettext-base, automake, autoconf, dh-python, python3 +Build-Depends: debhelper (>= 13), gettext-base, automake, autoconf, dh-python, python3 Homepage: https://byobu.org Vcs-Git: https://github.com/dustinkirkland/byobu From 237d811ad84a2882a8e4258cfe0ef52ae42dcd48 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 23 Jan 2024 09:03:34 -0600 Subject: [PATCH 14/25] fix timer string logic --- debian/changelog | 4 +++- usr/share/byobu/profiles/bashrc | 18 +++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 65facc31..2d7852d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ byobu (6.10) unreleased; urgency=medium * debian/compat, debian/control: - bump compat, fix vcs lintian warning, fix debhelper warnings + * usr/share/byobu/profiles/bashrc: + - fix timer string logic - -- Dustin Kirkland Mon, 22 Jan 2024 10:29:06 -0600 + -- Dustin Kirkland Tue, 23 Jan 2024 09:03:16 -0600 byobu (6.9-0ubuntu1) noble; urgency=medium diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index a319ed15..1455193e 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -44,21 +44,9 @@ byobu_prompt_runtime() { 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 + [ "$days" = "0" ] && days= || days="${days}d " + [ "$hours" = "0" ] && hours= || hours="${hours}h " + [ "$minutes" = "0" ] && minutes= || minutes="${minutes}m " str="${days}${hours}${minutes}${seconds}.${microseconds}s" printf "[%s]" "$str" 1>&2 } From 24cf51c2ade355c8154285f9713577e8af072305 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 23 Jan 2024 09:43:10 -0600 Subject: [PATCH 15/25] opening 6.11 --- debian/changelog | 10 ++++++++-- usr/bin/byobu.in | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d7852d4..8c69861e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ -byobu (6.10) unreleased; urgency=medium +byobu (6.11) unreleased; urgency=medium + + * UNRELEASED + + -- Dustin Kirkland Tue, 23 Jan 2024 09:43:10 -0600 + +byobu (6.10-0ubuntu1) noble; urgency=medium * debian/compat, debian/control: - bump compat, fix vcs lintian warning, fix debhelper warnings * usr/share/byobu/profiles/bashrc: - fix timer string logic - -- Dustin Kirkland Tue, 23 Jan 2024 09:03:16 -0600 + -- Dustin Kirkland Tue, 23 Jan 2024 09:43:03 -0600 byobu (6.9-0ubuntu1) noble; urgency=medium diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index 6cd87853..c53fb124 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=6.10 +VERSION=6.11 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. From 0514e53ba12ceed6bb6519da2d067310a0e72f74 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 10 Feb 2024 10:50:34 -0600 Subject: [PATCH 16/25] fix BYOBU_RUN_DIR and BYOBU_PREFIX issue https://github.com/dustinkirkland/byobu/pull/62 https://launchpad.net/bugs/2051995 LP: #2051995 --- debian/changelog | 7 +++++-- usr/share/byobu/profiles/bashrc | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c69861e..5a54874b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ byobu (6.11) unreleased; urgency=medium - * UNRELEASED + * usr/share/byobu/profiles/bashrc: + - fix BYOBU_RUN_DIR and BYOBU_PREFIX issue + - https://github.com/dustinkirkland/byobu/pull/62 + - https://launchpad.net/bugs/2051995 LP: #2051995 - -- Dustin Kirkland Tue, 23 Jan 2024 09:43:10 -0600 + -- Dustin Kirkland Sat, 10 Feb 2024 10:49:43 -0600 byobu (6.10-0ubuntu1) noble; urgency=medium diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index 1455193e..cf31b46b 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -25,6 +25,9 @@ case "$TERM" in esac [ -n "$BYOBU_CHARMAP" ] || BYOBU_CHARMAP=$(locale charmap 2>/dev/null || echo) [ -z "$USER" ] && export USER=$(whoami) +[ -d "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr" +[ -r "$BYOBU_PREFIX/lib/byobu/include/dirs" ] && . "$BYOBU_PREFIX/lib/byobu/include/dirs" + byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e " $e "; } byobu_prompt_symbol() { [ "$USER" = "root" ] && printf "%s" "#" || printf "%s" "\$"; } byobu_prompt_runtime() { From 63df0a8c8efcfddaef7d0c3eb054bdab9956b8ef Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 10 Feb 2024 10:56:56 -0600 Subject: [PATCH 17/25] Fix for VSCode, fish and byobu installations https://github.com/dustinkirkland/byobu/commit/f917d2169afdec623f5b32723d93bfd91d34b92f#commitcomment-137955113 --- debian/changelog | 5 ++++- usr/bin/byobu-launcher-install.in | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a54874b..bb7034e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,11 @@ byobu (6.11) unreleased; urgency=medium - fix BYOBU_RUN_DIR and BYOBU_PREFIX issue - https://github.com/dustinkirkland/byobu/pull/62 - https://launchpad.net/bugs/2051995 LP: #2051995 + * usr/bin/byobu-launcher-install.in: + - Fix for VSCode, fish and byobu installations + - https://github.com/dustinkirkland/byobu/commit/f917d2169afdec623f5b32723d93bfd91d34b92f#commitcomment-137955113 - -- Dustin Kirkland Sat, 10 Feb 2024 10:49:43 -0600 + -- Dustin Kirkland Sat, 10 Feb 2024 10:56:13 -0600 byobu (6.10-0ubuntu1) noble; urgency=medium diff --git a/usr/bin/byobu-launcher-install.in b/usr/bin/byobu-launcher-install.in index a73db22f..4ad6d0d3 100755 --- a/usr/bin/byobu-launcher-install.in +++ b/usr/bin/byobu-launcher-install.in @@ -49,8 +49,8 @@ install_launcher() { install_launcher_fish() { $PKG-launcher-uninstall "$1" || true - printf "if not set -q VSCODE_CWD" >> "$1" - printf " status --is-login; and status --is-interactive; and exec byobu-launcher" >> "$1" + printf "if not set -q VSCODE_CWD; " >> "$1" + printf " status --is-login; and status --is-interactive; and exec byobu-launcher;" >> "$1" printf "end" >> "$1" } From fc1b4580a89cb1aa37b732d185b2be648ec6037b Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 10 Feb 2024 11:04:14 -0600 Subject: [PATCH 18/25] added support for dnf package manager https://code.launchpad.net/~sanjay-ankur/byobu/byobu/+merge/415959 --- debian/changelog | 5 ++++- usr/lib/byobu/updates_available | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bb7034e8..b36066d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ byobu (6.11) unreleased; urgency=medium * usr/bin/byobu-launcher-install.in: - Fix for VSCode, fish and byobu installations - https://github.com/dustinkirkland/byobu/commit/f917d2169afdec623f5b32723d93bfd91d34b92f#commitcomment-137955113 + * usr/lib/byobu/updates_available: + - added support for dnf package manager + - https://code.launchpad.net/~sanjay-ankur/byobu/byobu/+merge/415959 - -- Dustin Kirkland Sat, 10 Feb 2024 10:56:13 -0600 + -- Dustin Kirkland Sat, 10 Feb 2024 11:03:36 -0600 byobu (6.10-0ubuntu1) noble; urgency=medium diff --git a/usr/lib/byobu/updates_available b/usr/lib/byobu/updates_available index 9bcc8202..6624255c 100755 --- a/usr/lib/byobu/updates_available +++ b/usr/lib/byobu/updates_available @@ -85,6 +85,9 @@ ___update_cache() { # Wolfi updates are cheap (~1s); so update cache every time apk update 2>&1 >/dev/null apk upgrade --simulate | grep -c " Upgrading " >$mycache 2>/dev/null & + elif eval $BYOBU_TEST dnf >/dev/null; then + # If dnf exists, use it + flock -xn "$flock" dnf list --upgrades -q -y | grep -vc "Available Upgrades" >$mycache 2>/dev/null & fi } @@ -141,6 +144,9 @@ ___update_needed() { # formulae database was updated [ "$(brew --prefix)/Library/Formula" -nt "$mycache" ] return $? + elif [ -e "/var/cache/dnf/packages.db" ]; then + [ "/var/cache/dnf/packages.db" -nt "$mycache" ] + return $? fi return 1 } From 946c975277bce7b11ba97bbac95c051f175ccca6 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 10 Feb 2024 11:24:14 -0600 Subject: [PATCH 19/25] opening 6.12 --- debian/changelog | 10 ++++++++-- usr/bin/byobu.in | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b36066d3..816cc94e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -byobu (6.11) unreleased; urgency=medium +byobu (6.12) unreleased; urgency=medium + + * UNRELEASED + + -- Dustin Kirkland Sat, 10 Feb 2024 11:24:14 -0600 + +byobu (6.11-0ubuntu1) noble; urgency=medium * usr/share/byobu/profiles/bashrc: - fix BYOBU_RUN_DIR and BYOBU_PREFIX issue @@ -11,7 +17,7 @@ byobu (6.11) unreleased; urgency=medium - added support for dnf package manager - https://code.launchpad.net/~sanjay-ankur/byobu/byobu/+merge/415959 - -- Dustin Kirkland Sat, 10 Feb 2024 11:03:36 -0600 + -- Dustin Kirkland Sat, 10 Feb 2024 11:24:04 -0600 byobu (6.10-0ubuntu1) noble; urgency=medium diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in index c53fb124..b04eb1ab 100755 --- a/usr/bin/byobu.in +++ b/usr/bin/byobu.in @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=6.11 +VERSION=6.12 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. From 0366c573a37ef5113b226cac53f0af87844cc841 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 17 Feb 2024 06:19:29 -0600 Subject: [PATCH 20/25] added git branch to bash ps1 prompt --- debian/changelog | 5 +++-- usr/share/byobu/profiles/bashrc | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 816cc94e..847f3551 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ byobu (6.12) unreleased; urgency=medium - * UNRELEASED + * usr/share/byobu/profiles/bashrc: + - added git branch to bash ps1 prompt - -- Dustin Kirkland Sat, 10 Feb 2024 11:24:14 -0600 + -- Dustin Kirkland Sat, 17 Feb 2024 06:18:47 -0600 byobu (6.11-0ubuntu1) noble; urgency=medium diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index cf31b46b..7fa07d67 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -28,6 +28,7 @@ esac [ -d "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr" [ -r "$BYOBU_PREFIX/lib/byobu/include/dirs" ] && . "$BYOBU_PREFIX/lib/byobu/include/dirs" +byobu_prompt_git() { git branch 2>/dev/null | sed -e "/^[^*]/d" -e "s/* \(.*\)/ (\1)/"; } byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e " $e "; } byobu_prompt_symbol() { [ "$USER" = "root" ] && printf "%s" "#" || printf "%s" "\$"; } byobu_prompt_runtime() { @@ -51,7 +52,7 @@ byobu_prompt_runtime() { [ "$hours" = "0" ] && hours= || hours="${hours}h " [ "$minutes" = "0" ] && minutes= || minutes="${minutes}m " str="${days}${hours}${minutes}${seconds}.${microseconds}s" - printf "[%s]" "$str" 1>&2 + printf "[%s] " "$str" 1>&2 } # Requires Bash 4.x export PS0='$(printf "%s" ${EPOCHREALTIME/./} >"$BYOBU_RUN_DIR/timer.$$")' @@ -59,7 +60,7 @@ 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[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 PS1="${debian_chroot:+($debian_chroot)}\[\e[03;5;15;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\]\e[38;5;102m\]\$(byobu_prompt_git)\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 @@ -75,14 +76,14 @@ case "$BYOBU_DISTRO" in fi ;; "Wolfi") - # Use Wolfi colors (pink / purple / grey) + # Use Wolfi colors (pink / purple / blue) # 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 - 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) " + 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\]\e[38;5;45m\]\$(byobu_prompt_git)\e[00m\]\$(byobu_prompt_symbol) " ;; *) # Use Googley colors (blue / red / yellow / blue / green / red ) - 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_git)\$(byobu_prompt_symbol)\[\e[00m\] " ;; esac From cd253f0229b68d3c2cffa8d862309c6ea7019d94 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 17 Feb 2024 07:29:21 -0600 Subject: [PATCH 21/25] releasing --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 847f3551..3f944579 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -byobu (6.12) unreleased; urgency=medium +byobu (6.12-0ubuntu1) noble; urgency=medium * usr/share/byobu/profiles/bashrc: - added git branch to bash ps1 prompt - -- Dustin Kirkland Sat, 17 Feb 2024 06:18:47 -0600 + -- Dustin Kirkland Sat, 17 Feb 2024 07:25:02 -0600 byobu (6.11-0ubuntu1) noble; urgency=medium From d315ccbd89412de186c859b485bc56b849e81792 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 29 Mar 2025 11:19:22 -0500 Subject: [PATCH 22/25] added help/version option to most executables --- debian/changelog | 7 +++++++ usr/lib/byobu/include/common | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3f944579..290b754e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +byobu (6.13) unreleased; urgency=medium + + * usr/lib/byobu/include/common: + - added -v|--version and -h|--help to most executables + + -- Dustin Kirkland Tue, 17 Sep 2024 19:46:50 -0500 + byobu (6.12-0ubuntu1) noble; urgency=medium * usr/share/byobu/profiles/bashrc: diff --git a/usr/lib/byobu/include/common b/usr/lib/byobu/include/common index 04ae4f4d..9081f6cb 100755 --- a/usr/lib/byobu/include/common +++ b/usr/lib/byobu/include/common @@ -53,3 +53,8 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then export BYOBU_DISTRO="$_RET" BYOBU_INCLUDED_LIBS=1 fi + +case "$1" in + -v|--version) [ "$(basename $0)" != "byobu" ] && exec byobu -v ;; + -h|--help) exec man $(basename $0) ;; +esac From 2ca86a554dc3269dd5a4a4133a71f3a3707d1ecf Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 29 Mar 2025 11:20:07 -0500 Subject: [PATCH 23/25] Description: strip time EPOCHREALTIME by digit not decimal separator original code stripped only by period defined decimal. Some locales separate by comma. The goal is to strip to a non-decimal, so instead only allowing digits, and using start of string ensures safety. Author: Jakub Skopal Origin: uptream, https://github.com/dustinkirkland/byobu/pull/71 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/byobu/+bug/2052610 Reviewed-by: John Chittum Last-Update: 2025-03-03 --- usr/share/byobu/profiles/bashrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index 7fa07d67..1709d047 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -37,8 +37,9 @@ byobu_prompt_runtime() { 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/./} + # strip to non-decimal time. avoids LP: #2052610 + endtime=${EPOCHREALTIME/[^0-9]/} + starttime=${starttime/[^0-9]/} duration=$((endtime - starttime)) days=$((duration/1000000/60/60/24)) hours=$((duration/1000000/60/60%24)) @@ -55,7 +56,7 @@ byobu_prompt_runtime() { printf "[%s] " "$str" 1>&2 } # Requires Bash 4.x -export PS0='$(printf "%s" ${EPOCHREALTIME/./} >"$BYOBU_RUN_DIR/timer.$$")' +export PS0='$(printf "%s" ${EPOCHREALTIME/[^0-9]/} >"$BYOBU_RUN_DIR/timer.$$")' case "$BYOBU_DISTRO" in "Ubuntu") From d647ef21383e7308fdb098e3a504bd404a6d3f50 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 29 Mar 2025 19:54:52 -0500 Subject: [PATCH 24/25] fix PS1 ANSI escape sequences causing line wrap errors --- debian/changelog | 4 +++- usr/share/byobu/profiles/bashrc | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 290b754e..6c56fd98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ byobu (6.13) unreleased; urgency=medium * usr/lib/byobu/include/common: - added -v|--version and -h|--help to most executables + * usr/share/byobu/profiles/bashrc: + - fix PS1 ANSI escape sequences causing line wrap errors - -- Dustin Kirkland Tue, 17 Sep 2024 19:46:50 -0500 + -- Dustin Kirkland Sat, 29 Mar 2025 19:53:42 -0500 byobu (6.12-0ubuntu1) noble; urgency=medium diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index 1709d047..502b55f7 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -29,7 +29,7 @@ esac [ -r "$BYOBU_PREFIX/lib/byobu/include/dirs" ] && . "$BYOBU_PREFIX/lib/byobu/include/dirs" byobu_prompt_git() { git branch 2>/dev/null | sed -e "/^[^*]/d" -e "s/* \(.*\)/ (\1)/"; } -byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e " $e "; } +byobu_prompt_status() { printf "%s" "[$?]"; } byobu_prompt_symbol() { [ "$USER" = "root" ] && printf "%s" "#" || printf "%s" "\$"; } byobu_prompt_runtime() { # Calculate the approximate runtime of the previous command @@ -53,7 +53,7 @@ byobu_prompt_runtime() { [ "$hours" = "0" ] && hours= || hours="${hours}h " [ "$minutes" = "0" ] && minutes= || minutes="${minutes}m " str="${days}${hours}${minutes}${seconds}.${microseconds}s" - printf "[%s] " "$str" 1>&2 + printf "[%s]" "$str" 1>&2 } # Requires Bash 4.x export PS0='$(printf "%s" ${EPOCHREALTIME/[^0-9]/} >"$BYOBU_RUN_DIR/timer.$$")' @@ -61,7 +61,7 @@ export PS0='$(printf "%s" ${EPOCHREALTIME/[^0-9]/} >"$BYOBU_RUN_DIR/timer.$$")' case "$BYOBU_DISTRO" in "Ubuntu") # Use Ubuntu colors (grey / orange / aubergine) - export PS1="${debian_chroot:+($debian_chroot)}\[\e[03;5;15;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\]\e[38;5;102m\]\$(byobu_prompt_git)\e[00m\]\$(byobu_prompt_symbol) " + export PS1="\$(byobu_prompt_runtime) --> \$(byobu_prompt_status)\n\[\e[38;5;245m\]\u\[\e[00m\]@\[\e[38;5;172m\]\h\[\e[00m\]:\[\e[38;5;5m\]\w\[\e[00m\]\$(byobu_prompt_git)\$(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 @@ -81,10 +81,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 - 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\]\e[38;5;45m\]\$(byobu_prompt_git)\e[00m\]\$(byobu_prompt_symbol) " + export PS1="\$(byobu_prompt_runtime) --> \$(byobu_prompt_status)\n\[\e[38;5;170m\]\u\[\e[00m\]@\[\e[38;5;98m\]\h\[\e[00m\]:\[\e[38;5;63m\]\w\[\e[00m\]\$(byobu_prompt_git)\$(byobu_prompt_symbol) " ;; *) - # Use Googley colors (blue / red / yellow / blue / green / red ) - 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_git)\$(byobu_prompt_symbol)\[\e[00m\] " + # Use primary colors (blue / yellow / red ) + export PS1="\$(byobu_prompt_runtime) --> \$(byobu_prompt_status)\n\[\e[38;5;69m\]\u\[\e[00m\]@\[\e[38;5;214m\]\h\[\e[00m\]:\[\e[38;5;167m\]\w\[\e[00m\]\$(byobu_prompt_git)\$(byobu_prompt_symbol) " ;; esac From 34ca6fec92c6742c655ddd81a68a893ab74345ac Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 29 Mar 2025 19:56:22 -0500 Subject: [PATCH 25/25] releasing 6.13 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c56fd98..0fa5450a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -byobu (6.13) unreleased; urgency=medium +byobu (6.13-0ubuntu1) plucky; urgency=medium * usr/lib/byobu/include/common: - added -v|--version and -h|--help to most executables * usr/share/byobu/profiles/bashrc: - fix PS1 ANSI escape sequences causing line wrap errors - -- Dustin Kirkland Sat, 29 Mar 2025 19:53:42 -0500 + -- Dustin Kirkland Sat, 29 Mar 2025 19:55:23 -0500 byobu (6.12-0ubuntu1) noble; urgency=medium