From 475b6f599ba752759084117ba0821d76900456c2 Mon Sep 17 00:00:00 2001 From: Patrick Van der Veken Date: Mon, 21 May 2018 14:42:03 +0200 Subject: [PATCH] Fix for pre RHEL/CentOS 6 --- sources/lib/core/include_os.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sources/lib/core/include_os.sh b/sources/lib/core/include_os.sh index ef2d9e8..2647f5e 100644 --- a/sources/lib/core/include_os.sh +++ b/sources/lib/core/include_os.sh @@ -57,13 +57,18 @@ then elif [[ -f /etc/SuSE-release ]] then LINUX_DISTRO="SuSE" - LINUX_RELEASE=$(grep 'VERSION' /etc/SuSE-release 2>/dev/null | cut -f2 -d'=' | tr -d ' ') - [[ -n "${LINUX_RELEASE}" ]] || LINUX_RELEASE=$(grep 'CPE_NAME' /etc/os-release 2>/dev/null | cut -f2 -d'=' | cut -f5 -d':') + LINUX_RELEASE=$(grep 'VERSION' /etc/SuSE-release 2>/dev/null | cut -f2 -d'=' 2>/dev/null | tr -d ' ' 2>/dev/null) + [[ -n "${LINUX_RELEASE}" ]] || LINUX_RELEASE=$(grep 'CPE_NAME' /etc/os-release 2>/dev/null | cut -f2 -d'=' 2>/dev/null | cut -f5 -d':' 2>/dev/null) elif [[ -f /etc/redhat-release ]] then LINUX_DISTRO="Redhat" - # system-release-cpe is present since Fedora 9 [cpe:/o:centos:linux:6:GA] - LINUX_RELEASE=$(cut -f5 -d':' /dev/null) + if [[ -f /etc/system-release-cpe ]] + then + # system-release-cpe is present since Fedora 9 [cpe:/o:centos:linux:6:GA] + LINUX_RELEASE=$(cut -f5 -d':' /dev/null) + else + LINUX_RELEASE=$(print "${LINUX_RELEASE##*release }") + fi else LINUX_DISTRO="${OS_NAME}" LINUX_RELEASE="unknown"