From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Tue, 25 Jul 2017 17:57:46 +0000 (+0200)
Subject: simplified recongnition of fedora and ubuntu major version number in guess_plattform()
X-Git-Tag: v0.8.5~4^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bd45fa303716330a857ac5186462b1cc956aae7;p=candi.git

simplified recongnition of fedora and ubuntu major version number in guess_plattform()
---

diff --git a/candi.sh b/candi.sh
index 4240007..5828655 100755
--- a/candi.sh
+++ b/candi.sh
@@ -562,17 +562,7 @@ guess_platform() {
         echo cray
     
     elif [ -f /etc/fedora-release ]; then
-        local FEDORANAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/fedora-release`
-        case ${FEDORANAME} in
-            "Schrödinger’s Cat"*) echo fedora19;;
-            "Heisenbug"*)         echo fedora20;;
-            "Twenty One"*)        echo fedora21;;
-            "Twenty Two"*)        echo fedora22;;
-            "Twenty Three"*)      echo fedora23;;
-            "Twenty Four"*)       echo fedora24;;
-            "Twenty Five"*)       echo fedora25;;
-            "Twenty Six"*)        echo fedora26;;
-        esac
+        echo fedora`lsb_release -r -s`
     
     elif [ -f /etc/redhat-release ]; then
         local RHELNAME=`gawk '{if (match($0,/\((.*)\)/,f)) print f[1]}' /etc/redhat-release`
@@ -587,11 +577,7 @@ guess_platform() {
         local DESCRIPTION=$(lsb_release -d -s)
         case ${DISTRO}:${CODENAME}:${DESCRIPTION} in
             *:*:*Debian*9*)       echo debian9;;
-            *:*:*Ubuntu*\ 12*)    echo ubuntu12;;
-            *:*:*Ubuntu*\ 14*)    echo ubuntu14;;
-            *:*:*Ubuntu*\ 15*)    echo ubuntu15;;
-            *:xenial*:*Ubuntu*)   echo ubuntu16;;
-            *:zesty*:*Ubuntu*)    echo ubuntu17;;
+            *:*:*Ubuntu*)         echo ubuntu`lsb_release -r -s`;;
             *:*:*openSUSE\ 12*)   echo opensuse12;;
             *:*:*openSUSE\ 13*)   echo opensuse13;;
         esac