diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2020-10-17 14:23:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 14:23:08 +0300 |
| commit | 4a21fd9a5c06bfce4787a1b023548c8375dc0581 (patch) | |
| tree | efff3ed7051423e024b99a30adb987311aed3da4 /include/osdetection | |
| parent | 85d36db113fc3584df9ef70b7ec8bb3abf835c45 (diff) | |
| parent | 791800f95d1e1090efc0ba29d958fa1a6d80ab7d (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include/osdetection')
| -rw-r--r-- | include/osdetection | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/osdetection b/include/osdetection index 66592a8f..107ee28f 100644 --- a/include/osdetection +++ b/include/osdetection @@ -261,6 +261,12 @@ OS_FULLNAME="${OS_NAME} ${OS_VERSION_FULL}" OS_REDHAT_OR_CLONE=1 ;; + "rosa") + LINUX_VERSION="ROSA Linux" + OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') + OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') + OS_NAME="ROSA Linux" + ;; "slackware") LINUX_VERSION="Slackware" OS_NAME="Slackware Linux" @@ -273,11 +279,11 @@ OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') OS_NAME="Ubuntu" ;; - "rosa") - LINUX_VERSION="ROSA Linux" + "zorin") + LINUX_VERSION="Zorin OS" + OS_NAME="Zorin OS" OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') OS_VERSION_FULL=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') - OS_NAME="ROSA Desktop Fresh R11.1" ;; *) ReportException "OS Detection" "Unknown OS found in /etc/os-release - Please create issue on GitHub project page: ${PROGRAM_SOURCE}" |