From 19bfb4a7a4e29fcab3654a8fc707d06582f2244d Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Sat, 15 Oct 2016 11:27:04 +0200
Subject: [PATCH] Version information for macOS

---
 include/osdetection | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/osdetection b/include/osdetection
index dfc95c68..2f551c95 100644
--- a/include/osdetection
+++ b/include/osdetection
@@ -42,16 +42,15 @@
             OS="MacOS"
             if [ -x /usr/bin/sw_vers ]; then
                 OS_NAME=$(/usr/bin/sw_vers -productName)
-                if [ "${OS_NAME}" = "Mac OS X" ]; then OS_NAME="macOS"; fi
                 OS_VERSION=$(/usr/bin/sw_vers -productVersion)
+                OS_VERSION_NAME="unknown"
                 case ${OS_VERSION} in
-                    10.9) OS_VERSION="Mavericks" ;;
-                    10.10) OS_VERSION="Yosemite" ;;
-                    10.11) OS_VERSION="El Capitan" ;;
-                    10.12) OS_VERSION="Sierra" ;;
-                    *) echo "Unknown macOS version. Do you know what version it is? Share at ${PROGRAM_SOURCE}" ;;
+                    10.9)  OS_FULLNAME="Mac OS X 10.9 (Mavericks)" ;;
+                    10.10) OS_FULLNAME="Mac OS X 10.10 (Yosemite)" ;;
+                    10.11) OS_FULLNAME="Mac OS X 10.11 (El Capitan)" ;;
+                    10.12) OS_FULLNAME="macOS 10.12 (Sierra)" ;;
+                    *) echo "Unknown macOS version. Do you know what version it is? Create an issue at ${PROGRAM_SOURCE}" ;;
                 esac
-                OS_FULLNAME="${OS_NAME} ${OS_VERSION}"
             else
                 # Fall back to a fairly safe name
                 OS_NAME="macOS"