Merge branch '59-determine-os-release-is-broken-on-linux' into 'master'

Resolve "determine OS release is broken on Linux"

Closes #59

See merge request Pmodules/src!24
This commit is contained in:
2019-07-24 17:30:47 +02:00
+14 -2
View File
@@ -272,9 +272,21 @@ There is NO WARRANTY, to the extent permitted by law."
}
std.get_os_release_linux() {
source /etc/os-release
local lsb_release=$(which lsb_release)
local ID=''
local VERSION_ID=''
if [[ -n $(which lsb_release) ]]; then
ID=$(lsb_release -is)
VERSION_ID=$(lsb_release -rs)
elif [[ -r '/etc/os-release' ]]; then
source /etc/os-release
else
std::die 4 "Cannot determin OS release!\n"
fi
case "${ID}" in
science | rhel | centos | fedora )
RedHatEnterpriseServer | RedHatEnterprise | Scientific | rhel | centos | fedora )
echo "rhel${VERSION_ID%.*}"
;;
* )