github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-21 05:53:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/lib/byobu/release: LP: #1068581

Browse source 
- simplify and use lsb_release -s -r when necessary
This commit is contained in:
Dustin Kirkland 2012-10-31 09:49:28 +01:00
commit 6510108ec1
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -19,6 +19,8 @@ byobu (5.22) unreleased; urgency=low
byobu-janitor runs byobu-janitor runs
- move metadata_available flag to more ephemeral run dir - move metadata_available flag to more ephemeral run dir
- drop timeout on metadata check to 5 seconds - drop timeout on metadata check to 5 seconds
* usr/lib/byobu/release: LP: #1068581
- simplify and use lsb_release -s -r when necessary
[ Jake Biesinger and Dustin Kirkland ] [ Jake Biesinger and Dustin Kirkland ]
* usr/share/byobu/keybindings/common, usr/share/byobu/keybindings/f- * usr/share/byobu/keybindings/common, usr/share/byobu/keybindings/f-

15
usr/lib/byobu/release
View file

@ -46,20 +46,7 @@ __release() {
fi fi
if [ -z "$RELEASE" ] && $BYOBU_TEST lsb_release >/dev/null 2>&1; then if [ -z "$RELEASE" ] && $BYOBU_TEST lsb_release >/dev/null 2>&1; then
# If lsb_release is available, use it # If lsb_release is available, use it
local r=$(lsb_release -s -d) RELEASE=$(lsb_release -s -r)
case "$r" in
Ubuntu*)
# Use the -d if an Ubuntu LTS
RELEASE="$r"
;;
*)
# But for other distros the description
# is too long, so build from -i and -r
local i=$(lsb_release -s -i)
r=$(lsb_release -s -r)
RELEASE="$i $r"
;;
esac
fi fi
if [ -n "$RELEASE_ABBREVIATED" ] && [ $RELEASE_ABBREVIATED -gt 0 ]; then if [ -n "$RELEASE_ABBREVIATED" ] && [ $RELEASE_ABBREVIATED -gt 0 ]; then
color bold2; printf "%.${RELEASE_ABBREVIATED}s" "$RELEASE"; color -- color bold2; printf "%.${RELEASE_ABBREVIATED}s" "$RELEASE"; color --