From 5e3944666cc8a2c63c1852d6342b45a5402f82b8 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 2 Jan 2024 19:09:04 -0600 Subject: [PATCH] within Wolfi, default to our 2nd status line --- debian/changelog | 9 ++++++++- usr/bin/byobu-janitor.in | 3 +++ usr/share/byobu/status/status | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 360d7d6c..19162f5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +byobu (6.3) jammy; urgency=medium + + * usr/bin/byobu-janitor.in, usr/share/byobu/status/status: + - within Wolfi, default to our 2nd status line + + -- Dustin Kirkland Tue, 02 Jan 2024 19:08:20 -0600 + byobu (6.2) released; urgency=medium * add a package count status item, useful for minimal containers @@ -5,7 +12,7 @@ byobu (6.2) released; urgency=medium * added a status line customized for containers * add wolfi color schemed PS1 prompt - -- Dustin Kirkland Sun, 31 Dec 2023 09:00:42 -0600 + -- Dustin Kirkland Tue, 02 Jan 2024 19:08:03 -0600 byobu (6.1) released; urgency=medium diff --git a/usr/bin/byobu-janitor.in b/usr/bin/byobu-janitor.in index 840f98d4..ca3c1ffa 100755 --- a/usr/bin/byobu-janitor.in +++ b/usr/bin/byobu-janitor.in @@ -4,6 +4,7 @@ # environtment and smooth upgrades # # Copyright (C) 2009 Canonical Ltd. +# Copyright (C) 2024 Dustin Kirkland # # Authors: Dustin Kirkland # @@ -89,6 +90,8 @@ for f in status statusrc; do if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then # Copy from skeleton, if possible cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f" + # If we're running in Wolfi for the first time, cycle to the 2nd status + [ "$f" = "status" ] && [ "$BYOBU_DISTRO" = "Wolfi" ] && $BYOBU_PREFIX/lib/byobu/include/cycle-status fi done diff --git a/usr/share/byobu/status/status b/usr/share/byobu/status/status index b676e9ac..35c80bfc 100644 --- a/usr/share/byobu/status/status +++ b/usr/share/byobu/status/status @@ -33,7 +33,7 @@ screen_lower_right="color network #disk_io custom #entropy raid reboot_required tmux_left="logo #distro release #arch session" # You can have as many tmux right lines below here, and cycle through them using Shift-F5 tmux_right="#network #disk_io #custom #entropy raid reboot_required updates_available #apport #services #mail #users uptime #fan_speed #cpu_temp #battery #wifi_quality #processes #packages load_average cpu_count cpu_freq memory #swap disk #whoami #hostname #ip_address #time_utc date time" -#tmux_right="network disk_io uptime processes packages load_average cpu_count cpu_freq memory disk date time" # Tailored for inside of containers +#tmux_right="network disk_io uptime processes packages load_average cpu_count cpu_freq memory disk date time" #tmux_right="network #disk_io #custom entropy raid reboot_required updates_available #apport #services #mail users uptime fan_speed cpu_temp battery wifi_quality #processes #packages load_average cpu_count cpu_freq memory #swap #disk whoami hostname ip_address #time_utc date time" #tmux_right="network #disk_io custom #entropy raid reboot_required updates_available #apport #services #mail users uptime #fan_speed #cpu_temp battery wifi_quality #processes #packages load_average cpu_count cpu_freq memory #swap #disk #whoami #hostname ip_address #time_utc date time" #tmux_right="#network disk_io #custom entropy #raid #reboot_required #updates_available #apport #services #mail #users #uptime fan_speed cpu_temp #battery #wifi_quality #processes #packages #load_average #cpu_count #cpu_freq #memory #swap whoami hostname ip_address #time_utc disk date time"