github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-24 07:06:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/lib/byobu/include/shutil, usr/lib/byobu/release: LP: #1278016

Browse source 
- /etc/issue might be modified to display corporate banners or
    legal warnings; try to use /etc/os-release if available
This commit is contained in:
Dustin Kirkland 2014-03-17 07:14:22 +09:00
commit 018c10c902
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -2,6 +2,9 @@ byobu (5.75) unreleased; urgency=medium
* debian/control: * debian/control:
- bump standards - bump standards
* usr/lib/byobu/include/shutil, usr/lib/byobu/release: LP: #1278016
- /etc/issue might be modified to display corporate banners or
legal warnings; try to use /etc/os-release if available
-- Dustin Kirkland <kirkland@ubuntu.com> Sun, 16 Mar 2014 12:46:36 -0700 -- Dustin Kirkland <kirkland@ubuntu.com> Sun, 16 Mar 2014 12:46:36 -0700

2
usr/lib/byobu/include/shutil
View file

@ -316,6 +316,8 @@ get_distro() {
if [ -n "$DISTRO" ]; then if [ -n "$DISTRO" ]; then
# user defined # user defined
true true
elif [ -r "/etc/os-release" ]; then
distro=$(. /etc/os-release && echo "$NAME")
elif [ -r "/etc/issue" ]; then elif [ -r "/etc/issue" ]; then
# lsb_release is *really* slow; try to use /etc/issue first # lsb_release is *really* slow; try to use /etc/issue first
local issue local issue

5
usr/lib/byobu/release
View file

@ -28,8 +28,11 @@ __release() {
if [ -n "$RELEASE" ]; then if [ -n "$RELEASE" ]; then
# user defined # user defined
true true
elif [ -r "/etc/os-release" ]; then
# lsb_release is *really* slow; try to use /etc/os-release
release=$(. /etc/os-release && echo "$VERSION_ID")
elif [ -r "/etc/issue" ]; then elif [ -r "/etc/issue" ]; then
# lsb_release is *really* slow; try to use /etc/issue first # next try /etc/issue first
local issue local issue
read issue < /etc/issue read issue < /etc/issue
case "$issue" in case "$issue" in