Better system OS detection for RHEL6 and Mac OS X (#6612)
* On RHEL 6 file /etc/lsb-release is pretty useless * Better OS version detection for Mac OS X
Piotr Roszatycki committed
Aug 9, 2019 at 08:21 UTC
4939021d5692df88e1e108b5c0d5f9b327a385e4
1 file changed
+4
-3
daemon/system-info.sh
+4
-3
@@ -22,8 +22,8 @@ if [ "${KERNEL_NAME}" = "Darwin" ]; then
22
OIFS="$IFS"
23
IFS=$'\n'
24
set $(sw_vers) > /dev/null
25
- NAME=$(echo $1 | tr "\n" ' ' | sed 's/ProductName:[ ]*//')
26
- VERSION=$(echo $2 | tr "\n" ' ' | sed 's/ProductVersion:[ ]*//')
25
+ NAME=$(echo $1 | tr "\n\t" ' ' | sed -e 's/ProductName:[ ]*//' -e 's/[ ]*$//')
26
+ VERSION=$(echo $2 | tr "\n\t" ' ' | sed -e 's/ProductVersion:[ ]*//' -e 's/[ ]*$//')
27
ID="mac"
28
ID_LIKE="mac"
29
OS_DETECTION="sw_vers"
@@ -44,7 +44,8 @@ else
44
if [ "${NAME}" = "unknown" ]; then NAME="${DISTRIB_ID}"; fi
45
if [ "${VERSION}" = "unknown" ]; then VERSION="${DISTRIB_RELEASE}"; fi
46
if [ "${ID}" = "unknown" ]; then ID="${DISTRIB_CODENAME}"; fi
47
- elif [ -n "$(command -v lsb_release 2>/dev/null)" ]; then
47
+ fi
48
+ if [ -n "$(command -v lsb_release 2>/dev/null)" ]; then
49
if [ "${OS_DETECTION}" = "unknown" ]; then OS_DETECTION="lsb_release"; else OS_DETECTION="Mixed"; fi
50
if [ "${NAME}" = "unknown" ]; then NAME="$(lsb_release -is 2>/dev/null)"; fi
51
if [ "${VERSION}" = "unknown" ]; then VERSION="$(lsb_release -rs 2>/dev/null)"; fi