diff --git a/bin/ec2-cost b/bin/ec2-cost index 2be1e6d9..772a2436 100755 --- a/bin/ec2-cost +++ b/bin/ec2-cost @@ -1,7 +1,6 @@ #!/bin/sh # # ec2-cost: approximate EC2 cost (USD) of the current instance -# # Copyright (C) 2008 Canonical Ltd. # # Authors: Dustin Kirkland diff --git a/bin/release b/bin/release index 9ad88127..6381591f 100755 --- a/bin/release +++ b/bin/release @@ -21,4 +21,10 @@ p="release" grep -qs "^$p=0$" "$HOME/.screen-profiles/status" && exit 0 -echo $(/usr/bin/lsb_release -s -i) $(/usr/bin/lsb_release -s -r) +if [ -x "/usr/bin/lsb_release" ]; then + echo $(/usr/bin/lsb_release -s -i) $(/usr/bin/lsb_release -s -r) +elif [ -r "/etc/issue" ]; then + head -n1 /etc/issue | awk '{print $1}' +else + echo "Unknown" +fi diff --git a/debian/changelog b/debian/changelog index fe0b4e17..024c375a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,11 +6,12 @@ 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 [ James Wilcox ] * bin/updates-available: support SUSE's zypper - -- Dustin Kirkland Wed, 25 Mar 2009 14:14:49 -0500 + -- Dustin Kirkland Thu, 26 Mar 2009 10:41:23 -0500 screen-profiles (1.40-0ubuntu1) jaunty; urgency=low diff --git a/profiles/common b/profiles/common index f03c8053..5e444274 100644 --- a/profiles/common +++ b/profiles/common @@ -3,7 +3,9 @@ # This configuration profile is intended to be a common header of useful # functionality, included by other profiles. # -# Copyright (C) 2008 Dustin Kirkland +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Dustin Kirkland # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/profiles/generate-profiles b/profiles/generate-profiles index b98061ca..3488c484 100755 --- a/profiles/generate-profiles +++ b/profiles/generate-profiles @@ -1,4 +1,22 @@ #!/bin/sh +# generate-profiles: dynamically generate all profiles +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + # This script should be run during in the './debian/rules get-orig-source' # step. diff --git a/profiles/logos/slackware b/profiles/logos/slackware new file mode 100644 index 00000000..127f6cf5 --- /dev/null +++ b/profiles/logos/slackware @@ -0,0 +1 @@ +%{=u Bk},S diff --git a/profiles/plain b/profiles/plain index 7880bc0b..621f6e5c 100644 --- a/profiles/plain +++ b/profiles/plain @@ -3,7 +3,10 @@ # This configuration profile is the most basic, plain profile, # (the default one that ships with screen). # -# Copyright (C) 2008 Dustin Kirkland +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Dustin Kirkland + # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/profiles/profile.skel b/profiles/profile.skel index 7bfbcaa0..7e4b88bb 100644 --- a/profiles/profile.skel +++ b/profiles/profile.skel @@ -3,7 +3,9 @@ # This configuration profile is intended to roughly approximate graphical # desktop within 'screen'; inspired by the Ubuntu Gnome Desktop. # -# Copyright (C) 2008 Dustin Kirkland +# Copyright (C) 2008 Canonical Ltd. +# +# Authors: Dustin Kirkland # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by