From 314bbfea4353538376322d085c2c0c061bf304b3 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Thu, 26 Mar 2009 14:46:55 -0500 Subject: [PATCH] bin/release: determine release from /etc/issue if lsb-release not found; don't use fully qualified path for lsb_release as it seems this has moved around (see Dapper) --- bin/release | 4 ++-- debian/changelog | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/release b/bin/release index 6381591f..cedb993d 100755 --- a/bin/release +++ b/bin/release @@ -21,8 +21,8 @@ p="release" grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0 -if [ -x "/usr/bin/lsb_release" ]; then - echo $(/usr/bin/lsb_release -s -i) $(/usr/bin/lsb_release -s -r) +if which lsb_release >/dev/null; then + echo $(lsb_release -s -i) $(lsb_release -s -r) elif [ -r "/etc/issue" ]; then head -n1 /etc/issue | awk '{print $1}' else diff --git a/debian/changelog b/debian/changelog index 024c375a..a3394f02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,12 +6,14 @@ screen-profiles (1.41) unreleased; urgency=low * profiles/generate-profiles: reorganize cleaning and echo's * debian/rules: generate profiles as part of the build, rather than get-orig-source - * bin/release: determine release from /etc/issue if lsb-release not found + * bin/release: determine release from /etc/issue if lsb-release not found; + don't use fully qualified path for lsb_release as it seems this has moved + around (see Dapper) [ James Wilcox ] * bin/updates-available: support SUSE's zypper - -- Dustin Kirkland Thu, 26 Mar 2009 10:41:23 -0500 + -- Dustin Kirkland Thu, 26 Mar 2009 14:46:18 -0500 screen-profiles (1.40-0ubuntu1) jaunty; urgency=low