diff --git a/debian/changelog b/debian/changelog index c7d88c81..827544e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,11 @@ byobu (5.134) unreleased; urgency=medium - fix inverted logic on session reuse * usr/lib/byobu/logo: - added a logo for Wolfi + * usr/lib/byobu/include/shutil, usr/lib/byobu/release: + - Wolfi doesn't really have versions, so just use the distro + name rather than version id - -- Dustin Kirkland Mon, 27 Nov 2023 10:11:15 -0600 + -- Dustin Kirkland Tue, 28 Nov 2023 20:32:40 -0600 byobu (5.133-0ubuntu1) focal; urgency=medium diff --git a/usr/lib/byobu/include/shutil b/usr/lib/byobu/include/shutil index 0f6d3ed6..f2e413f2 100755 --- a/usr/lib/byobu/include/shutil +++ b/usr/lib/byobu/include/shutil @@ -320,6 +320,10 @@ get_distro() { Debian*) [ -r /etc/lsb-release ] && distro=$(. /etc/lsb-release && [ -n "$GOOGLE_ID" ] && echo "gLinux" || echo "Debian") ;; + *) + # assume first field is what we want + distro="${issue%% *}"; + ;; esac elif [ -r "/etc/issue" ]; then # lsb_release is *really* slow; try to use /etc/issue first diff --git a/usr/lib/byobu/release b/usr/lib/byobu/release index 382dbf81..406bd916 100755 --- a/usr/lib/byobu/release +++ b/usr/lib/byobu/release @@ -28,6 +28,9 @@ __release() { if [ -n "$RELEASE" ]; then # user defined true + elif [ "$BYOBU_DISTRO" = "Wolfi" ]; then + # Wolfi, and perhaps other distroless distros don't really have release versions + RELEASE="Wolfi" elif [ -r "/etc/os-release" ]; then # lsb_release is *really* slow; try to use /etc/os-release RELEASE=$(. /etc/os-release && echo "$VERSION_ID")