aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkate.ward <kate.ward@forestent.com>2008-11-15 20:24:03 +0000
committerkate.ward <kate.ward@forestent.com>2008-11-15 20:24:03 +0000
commitbbbce1edc9bc5cb2e4f2453ab27365eb12b86285 (patch)
treea40dd64a2accf4446fd1b5e37f0b3508ea6878f1
parent8f036dbed15b523ae11948b9c1d5ca50f9c7e012 (diff)
downloadshflags-bbbce1edc9bc5cb2e4f2453ab27365eb12b86285.tar.gz
improved os check to work for RH Linux 9
-rwxr-xr-xsource/1.0/lib/versions10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/1.0/lib/versions b/source/1.0/lib/versions
index 1acbf88..24757f1 100755
--- a/source/1.0/lib/versions
+++ b/source/1.0/lib/versions
@@ -51,8 +51,14 @@ versions_osVersion()
;;
Linux)
if [ -r '/etc/lsb-release' ]; then
- os_version_=`. /etc/lsb-release \
- && echo "${DISTRIB_ID}-${DISTRIB_RELEASE}"`
+ os_version_=`. /etc/lsb-release && \
+ echo "${DISTRIB_ID:-}-${DISTRIB_RELEASE:-}"`
+ fi
+ if [ "${os_version_}" = '-' ]; then
+ os_version_=''
+ if [ -r '/etc/redhat-release' ]; then
+ os_version_=`cat /etc/redhat-release`
+ fi
fi
;;
SunOS) os_version_=`echo ${os_release_} |sed 's/[0-9]*\.\([0-9]*\)/\1/'` ;;