diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2020-03-04 16:48:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 16:48:19 +0300 |
| commit | b011b7a8d52138fa9472904c33a85b2bb8efaacc (patch) | |
| tree | b544a68b6fbe7276e57d273b573644b028b76459 | |
| parent | d81cc71790144ed9ff354748254d300d297f3da6 (diff) | |
| parent | 0cd256372cda0d41d95a176e37e0404f426ccb1e (diff) | |
Merge pull request #850 from gcsgithub/soerelease
Soerelease
| -rw-r--r-- | include/osdetection | 1 | ||||
| -rw-r--r-- | include/parameters | 4 | ||||
| -rwxr-xr-x | lynis | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/osdetection b/include/osdetection index cf9d1eac..f06b23b6 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 diff --git a/include/parameters b/include/parameters index 77a6084f..bdbbfae5 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 ;; @@ -337,7 +337,7 @@ ;; # Strip the colors which aren't clearly visible on light backgrounds - --reverse-colors) + --reverse-colors| --reverse-colours) BLUE="${NORMAL}"; SECTION="${NORMAL}"; NOTICE="${NORMAL}"; @@ -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 |