From 30b1e4170bfffad8894b68d8b82f2e2cfa3e89b0 Mon Sep 17 00:00:00 2001
From: Mark Garrett <mark.garrett@optus.com.au>
Date: Sun, 1 Mar 2020 10:18:33 +1100
Subject: [PATCH 1/3] macosx add Catalina 10.15

---
 include/osdetection | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/osdetection b/include/osdetection
index cf9d1eac..c048c0ac 100644
--- a/include/osdetection
+++ b/include/osdetection
@@ -61,6 +61,7 @@
                     10.12 | 10.12.[0-9]*) OS_FULLNAME="macOS Sierra (${OS_VERSION})" ;;
                     10.13 | 10.13.[0-9]*) OS_FULLNAME="macOS High Sierra (${OS_VERSION})" ;;
                     10.14 | 10.14.[0-9]*) OS_FULLNAME="macOS Mojave (${OS_VERSION})" ;;
+		    10.15 | 10.15.[0-9]*) OS_FULLNAME="macOS Catalina (${OS_VERSION})" ;;
                     *) echo "Unknown macOS version. Do you know what version it is? Create an issue at ${PROGRAM_SOURCE}" ;;
                 esac
             else

From b2f676da7bf99090f384888b56bc20216bb5bc94 Mon Sep 17 00:00:00 2001
From: Mark Garrett <mark.garrett@optus.com.au>
Date: Sun, 1 Mar 2020 10:19:33 +1100
Subject: [PATCH 2/3] allow for correct spelling for colour should drop the s
 from colours but didnt

---
 include/parameters | 4 ++--
 lynis              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/parameters b/include/parameters
index b8676b4c..e682824f 100644
--- a/include/parameters
+++ b/include/parameters
@@ -270,7 +270,7 @@
             ;;
 
             # Don't use colors
-            --no-colors | --nocolors)
+            --no-colors | --nocolors | --no-colours | --nocolours)
                 COLORS=0
                 RemoveColors
             ;;
@@ -332,7 +332,7 @@
             ;;
 
             # Strip the colors which aren't clearly visible on light backgrounds
-            --reverse-colors)
+            --reverse-colors| --reverse-colours)
                 BLUE="${NORMAL}";
                 SECTION="${NORMAL}";
                 NOTICE="${NORMAL}";
diff --git a/lynis b/lynis
index 081833bb..66a56acc 100755
--- a/lynis
+++ b/lynis
@@ -436,8 +436,10 @@ ${YELLOW}Note: ${WHITE}Cancelling the program can leave temporary files behind${
 
     ${WHITE}Layout options${NORMAL}
     ${GRAY}--no-colors${NORMAL}                       : Don't use colors in output
+    ${GRAY}--no-colours${NORMAL}                      : Don't use colours in output
     ${GRAY}--quiet (-q)${NORMAL}                      : No output
     ${GRAY}--reverse-colors${NORMAL}                  : Optimize color display for light backgrounds
+    ${GRAY}--reverse-colours${NORMAL}                 : Optimize colour display for light backgrounds
 
     ${WHITE}Misc options${NORMAL}
     ${GRAY}--debug${NORMAL}                           : Debug logging to screen

From 0cd256372cda0d41d95a176e37e0404f426ccb1e Mon Sep 17 00:00:00 2001
From: Mark Garrett <mark.garrett@optus.com.au>
Date: Sun, 1 Mar 2020 10:31:52 +1100
Subject: [PATCH 3/3] fix whitespace

---
 include/osdetection | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/osdetection b/include/osdetection
index c048c0ac..f06b23b6 100644
--- a/include/osdetection
+++ b/include/osdetection
@@ -61,7 +61,7 @@
                     10.12 | 10.12.[0-9]*) OS_FULLNAME="macOS Sierra (${OS_VERSION})" ;;
                     10.13 | 10.13.[0-9]*) OS_FULLNAME="macOS High Sierra (${OS_VERSION})" ;;
                     10.14 | 10.14.[0-9]*) OS_FULLNAME="macOS Mojave (${OS_VERSION})" ;;
-		    10.15 | 10.15.[0-9]*) OS_FULLNAME="macOS Catalina (${OS_VERSION})" ;;
+                    10.15 | 10.15.[0-9]*) OS_FULLNAME="macOS Catalina (${OS_VERSION})" ;;
                     *) echo "Unknown macOS version. Do you know what version it is? Create an issue at ${PROGRAM_SOURCE}" ;;
                 esac
             else