mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 14:24:39 -07:00
bin/logo, bin/release: when looking at /etc/issue, grab the first
line that starts with a real letter rather than control character, LP: #432751
This commit is contained in:
parent
11f03ab725
commit
0272ed25eb
3 changed files with 5 additions and 2 deletions
2
bin/logo
2
bin/logo
|
@ -104,7 +104,7 @@ fi
|
||||||
|
|
||||||
if [ -r "/etc/issue" ]; then
|
if [ -r "/etc/issue" ]; then
|
||||||
# Otherwise, check /etc/issue
|
# Otherwise, check /etc/issue
|
||||||
distro=`cat /etc/issue`
|
distro=`grep -m1 "^[A-Za-z]" /etc/issue`
|
||||||
print_logo "$distro" && exit 0 || true
|
print_logo "$distro" && exit 0 || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ elif [ -r "/etc/palm-build-info" ]; then
|
||||||
DISTRO=$(grep "^PRODUCT_VERSION_STRING=Palm " /etc/palm-build-info | sed "s/^.*=Palm //")
|
DISTRO=$(grep "^PRODUCT_VERSION_STRING=Palm " /etc/palm-build-info | sed "s/^.*=Palm //")
|
||||||
elif [ -r "/etc/issue" ]; then
|
elif [ -r "/etc/issue" ]; then
|
||||||
# Otherwise, grab part of /etc/issue, ideally the distro and version
|
# Otherwise, grab part of /etc/issue, ideally the distro and version
|
||||||
DISTRO=$(head -n1 /etc/issue | sed "s/ [^0-9]* / /" | awk '{print $1 " " $2}')
|
DISTRO=$(grep -m1 "^[A-Za-z]" /etc/issue | sed "s/ [^0-9]* / /" | awk '{print $1 " " $2}')
|
||||||
else
|
else
|
||||||
DISTRO="Byobu"
|
DISTRO="Byobu"
|
||||||
fi
|
fi
|
||||||
|
|
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -6,6 +6,9 @@ byobu (2.46) unreleased; urgency=low
|
||||||
* byobu-config, doc/help.txt: insert version number in byobu help menu,
|
* byobu-config, doc/help.txt: insert version number in byobu help menu,
|
||||||
LP: #502119
|
LP: #502119
|
||||||
* bin/network: match interface a bit better for bridges, LP: #498722
|
* bin/network: match interface a bit better for bridges, LP: #498722
|
||||||
|
* bin/logo, bin/release: when looking at /etc/issue, grab the first
|
||||||
|
line that starts with a real letter rather than control character,
|
||||||
|
LP: #432751
|
||||||
|
|
||||||
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 07 Jan 2010 21:53:14 -0600
|
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 07 Jan 2010 21:53:14 -0600
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue