diff options
| author | Kate Ward <kate.ward@forestent.com> | 2017-12-21 00:59:41 +0100 |
|---|---|---|
| committer | Kate Ward <kate.ward@forestent.com> | 2017-12-21 00:59:41 +0100 |
| commit | 91587503e755715e171546cf065c3982a03d6459 (patch) | |
| tree | a68bb8435a13da3af7ee45d3b008315b7b2488f0 /lib | |
| parent | 65f885726055a1a19487806efa2e86ab87a638d6 (diff) | |
| download | shflags-91587503e755715e171546cf065c3982a03d6459.tar.gz | |
Updated test_runner and versions from upstream.
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/versions | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/versions b/lib/versions index ea46ccc..95eebd3 100755 --- a/lib/versions +++ b/lib/versions @@ -82,15 +82,20 @@ versions_osVersion() { os_version_=`expr "${os_release_}" : '\([0-9]*\.[0-9]*\)-.*'` ;; Linux) - if [ -r "${LSB_RELEASE}" ]; then + if [ -r '/etc/os-release' ]; then + os_version_=`awk -F= '$1~/PRETTY_NAME/{print $2}' /etc/os-release \ + |sed 's/"//g'` + elif [ -r '/etc/redhat-release' ]; then + os_version_=`cat /etc/redhat-release` + elif [ -r '/etc/SuSE-release' ]; then + os_version_=`head -n 1 /etc/SuSE-release` + elif [ -r "${LSB_RELEASE}" ]; then if grep -q 'DISTRIB_ID=Ubuntu' "${LSB_RELEASE}"; then # shellcheck disable=SC2002 os_version_=`cat "${LSB_RELEASE}" \ |awk -F= '$1~/DISTRIB_DESCRIPTION/{print $2}' \ |sed 's/"//g;s/ /-/g'` fi - elif [ -r '/etc/redhat-release' ]; then - os_version_=`cat /etc/redhat-release` fi ;; SunOS) |