From 8a0cd025cde29ced3687459cd93a9ecfff154cde Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 16 Jun 2010 23:35:18 -0500 Subject: [PATCH] Save a fork: * usr/lib/byobu/custom, usr/lib/byobu/release --- debian/changelog | 3 ++- usr/lib/byobu/release | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index eebd1746..b7e92014 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ byobu (2.81) unreleased; urgency=low - * usr/lib/byobu/custom: save a fork + Save a fork: + * usr/lib/byobu/custom, usr/lib/byobu/release -- Dustin Kirkland Wed, 16 Jun 2010 12:46:29 -0500 diff --git a/usr/lib/byobu/release b/usr/lib/byobu/release index ff1c03df..d1826f4d 100755 --- a/usr/lib/byobu/release +++ b/usr/lib/byobu/release @@ -35,16 +35,19 @@ elif which lsb_release >/dev/null 2>&1; then fi # If lsb_release is available, use it r=$(lsb_release -s -d) - if echo "$r" | grep -qs "^Ubuntu .*\..*\..*$"; then - # Use the -d if an Ubuntu LTS - DISTRO="$r" - else - # But for other distros the description - # is too long, so build from -i and -r - i=$(lsb_release -s -i) - r=$(lsb_release -s -r) - DISTRO="$i $r" - fi + case "$r" in + Ubuntu*.*.*) + # Use the -d if an Ubuntu LTS + DISTRO="$r" + ;; + *) + # But for other distros the description + # is too long, so build from -i and -r + i=$(lsb_release -s -i) + r=$(lsb_release -s -r) + DISTRO="$i $r" + ;; + esac elif [ -r "/etc/palm-build-info" ]; then # Palm Pre hack DISTRO=$(grep "^PRODUCT_VERSION_STRING=Palm " /etc/palm-build-info | sed "s/^.*=Palm //")