github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-19 13:09:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/lib/byobu/include/shutil, usr/lib/byobu/release:

Browse source 
- Wolfi doesn't really have versions, so just use the distro
    name rather than version id
This commit is contained in:
Dustin Kirkland 2023-11-28 20:33:18 -06:00
commit c3e907c5a1
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
debian/changelog vendored
View file

@ -17,8 +17,11 @@ byobu (5.134) unreleased; urgency=medium
- fix inverted logic on session reuse - fix inverted logic on session reuse
* usr/lib/byobu/logo: * usr/lib/byobu/logo:
- added a logo for Wolfi - 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 <kirkland@ubuntu.com> Mon, 27 Nov 2023 10:11:15 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Tue, 28 Nov 2023 20:32:40 -0600
byobu (5.133-0ubuntu1) focal; urgency=medium byobu (5.133-0ubuntu1) focal; urgency=medium

4
usr/lib/byobu/include/shutil
View file

@ -320,6 +320,10 @@ get_distro() {
Debian*) Debian*)
[ -r /etc/lsb-release ] && distro=$(. /etc/lsb-release && [ -n "$GOOGLE_ID" ] && echo "gLinux" || echo "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 esac
elif [ -r "/etc/issue" ]; then elif [ -r "/etc/issue" ]; then
# lsb_release is *really* slow; try to use /etc/issue first # lsb_release is *really* slow; try to use /etc/issue first

3
usr/lib/byobu/release
View file

@ -28,6 +28,9 @@ __release() {
if [ -n "$RELEASE" ]; then if [ -n "$RELEASE" ]; then
# user defined # user defined
true 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 elif [ -r "/etc/os-release" ]; then
# lsb_release is *really* slow; try to use /etc/os-release # lsb_release is *really* slow; try to use /etc/os-release
RELEASE=$(. /etc/os-release && echo "$VERSION_ID") RELEASE=$(. /etc/os-release && echo "$VERSION_ID")