Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit a0a41b23c9e4bcb5b1c4ac5be599519e1daba075
Subproject commit d26aac665e773a5861fa2d080a78454cf849f27a

17
mk/linux/mg_shared.sh
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

2
mk/linux/start_megaglest
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

20
source/tools/support/linux/system_report
View File

@ -8,7 +8,7 @@
# -----------------------------------------------------------------------------
#
# Written by Tom Reynolds <tomreyn[at]megaglest.org>
# Copyright (c) 2012 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0
# Copyright (c) 2012-2016 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0
#
# -----------------------------------------------------------------------------
#
@ -227,11 +227,19 @@ echo '' >> $REPORT_LOCATION
if [ `which lsb_release`'x' = 'x' ]
then # no lsb_release in path
lsb=0
if [ -e /etc/debian_version ]; then distribution='Debian'; release='unknown release version'; codename=`cat /etc/debian_version`; fi
if [ -e /etc/SuSE-release ]; then distribution='SuSE'; release='unknown release version'; codename=`cat /etc/SuSE-release`; fi
if [ -e /etc/fedora-release ]; then distribution='Fedora'; release='unknown release version'; codename=`cat /etc/fedora-release`; fi
if [ -e /etc/redhat-release ]; then distribution='Redhat'; release='unknown release version'; codename=`cat /etc/redhat-release`; fi
if [ -e /etc/mandrake-release ]; then distribution='Mandrake'; release='unknown release version'; codename=`cat /etc/mandrake-release`; fi
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}')"
elif [ -e /etc/debian_version ]; then distribution='Debian'; codename="$(cat /etc/debian_version)"
elif [ -e /etc/SuSE-release ]; then distribution='SuSE'; codename="$(cat /etc/SuSE-release)"
elif [ -e /etc/redhat-release ]; then
if [ -e /etc/fedora-release ]; then distribution='Fedora'; codename="$(cat /etc/fedora-release)"
else distribution='Redhat'; codename="$(cat /etc/redhat-release)"; fi
elif [ -e /etc/fedora-release ]; then distribution='Fedora'; codename="$(cat /etc/fedora-release)"
elif [ -e /etc/mandrake-release ]; then distribution='Mandrake'; codename="$(cat /etc/mandrake-release)"
else distribution='unknown distribution'; codename='unknown codename'; fi
else
lsb=1
distribution=`lsb_release -i | awk -F':' '{ gsub(/^[ \t]*/,"",$2); print $2 }'`