From ae02e81101f9339d64a36584de7cc0ef3d951390 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Sun, 16 Oct 2016 11:55:11 +0200 Subject: [PATCH] Improve usage of /etc/os-release --- include/osdetection | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/osdetection b/include/osdetection index 7710349d..4e1dfb5d 100644 --- a/include/osdetection +++ b/include/osdetection @@ -129,11 +129,17 @@ "CoreOS") LINUX_VERSION="CoreOS" OS_FULLNAME=$(grep "^PRETTY_NAME=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') - OS_VERSION=$(grep "^VERSION=" /etc/os-release | awk -F= '{print $2}') + OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') OS_NAME="CoreOS Linux" ;; + "Ubuntu") + LINUX_VERSION="Ubuntu" + OS_FULLNAME=$(grep "^PRETTY_NAME=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') + OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}' | tr -d '"') + OS_NAME="Ubuntu Linux" + ;; *) - echo "Unknown OS found in /etc/os-release. Do you know what it is? Create an issue at ${PROGRAM_SOURCE" + Debug "Unknown OS found in /etc/os-release. Do you know what it is? Create an issue at ${PROGRAM_SOURCE}" ;; esac fi