added support for os-release

This commit is contained in:
filux
2016-09-30 21:16:19 +02:00
parent f40ac1d89f
commit 82b263e336
4 changed files with 27 additions and 14 deletions

View File

@@ -20,32 +20,35 @@ function detect_system {
if [ "$(which lsb_release)" = "" ]; then
lsb=0
if [ -e /etc/debian_version ]; then
release='unknown release'
if [ -e "/etc/os-release" ]; then
distribution="$(cat "/etc/os-release" | grep '^ID=' | awk -F '=' '{print $2}' \
| awk '{print toupper(substr($0,1,1))substr($0,2)}')"
codename="$(cat "/etc/os-release" | grep '^PRETTY_NAME=' | awk -F '"' '{print $2}')"
# example output ^ on debian testing: "Debian GNU/Linux stretch/sid"
elif [ -e /etc/debian_version ]; then
distribution='Debian'
release='unknown release version'
codename="$(cat /etc/debian_version)"
elif [ -e /etc/SuSE-release ]; then
distribution='SuSE'
release='unknown release version'
codename="$(cat /etc/SuSE-release)"
elif [ -e /etc/redhat-release ]; then
if [ -e /etc/fedora-release ]; then
distribution='Fedora'
release='unknown release version'
codename="$(cat /etc/fedora-release)"
else
distribution='Redhat'
release='unknown release version'
codename="$(cat /etc/redhat-release)"
fi
elif [ -e /etc/fedora-release ]; then
distribution='Fedora'
release='unknown release version'
codename="$(cat /etc/fedora-release)"
elif [ -e /etc/mandrake-release ]; then
distribution='Mandrake'
release='unknown release version'
codename="$(cat /etc/mandrake-release)"
else
distribution='unknown distribution'
codename='unknown codename'
fi
else
lsb=1

View File

@@ -29,6 +29,8 @@ BeginTime="$(date +"%s")"
WhichLsbRelease="$(which lsb_release 2>/dev/null)"
if [ "$WhichLsbRelease" != "" ]; then
OS_INFO="$($WhichLsbRelease -d | awk -F ':[ \t]*' '{print $2}')"
elif [ -e "/etc/os-release" ]; then
OS_INFO="$(cat "/etc/os-release" | grep '^PRETTY_NAME=' | awk -F '"' '{print $2}')"
fi
if [ "$OperatingMode" != "--tool-buginfo" ]; then