]> Creatis software - creaToolsTools.git/commitdiff
#2786 creaToolsTools Bug New Normal - Fedora 23 - Not recognition of Linux distritution
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 18 May 2016 21:25:24 +0000 (23:25 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Wed, 18 May 2016 21:25:24 +0000 (23:25 +0200)
Linux/scripts/Install-Creatools-Bin.sh
Linux/scripts/LocalFunctions.sh

index da113ec0cb67909509cf24774d252377feb780f8..6482e11676a91e79b69873b3e28ee5568580edbe 100755 (executable)
@@ -28,7 +28,7 @@ function getDistrib {
     local OS=`uname`
 
       if [ "$OS" == Darwin ] ; then OS=MacOS;
-    elif [ "$OS" == Linux  ] ; then OS=`awk 'NR==1{print $1}' /etc/issue`
+    elif [ "$OS" == Linux  ] ; then OS=`awk 'NR==1{print $1}' /etc/system-release`
     else OS=""
     fi
 # checkDistrib $OS
index 493ce661f20b5418b40beae930de4815f2609df5..b9694a04ad60758178c800bd1268aab87ac80b32 100644 (file)
@@ -63,7 +63,7 @@ function getDistrib {
     local OS=`uname`
 
       if [ "$OS" == Darwin ] ; then OS=MacOS;
-    elif [ "$OS" == Linux  ] ; then OS=`awk 'NR==1{print $1}' /etc/issue`
+    elif [ "$OS" == Linux  ] ; then OS=`awk 'NR==1{print $1}' /etc/system-release`
     else OS=""
     fi
 # checkDistrib $OS
@@ -75,7 +75,7 @@ function getDistribVersion {
     local DISTRIB=`getDistrib`
 
       if [ "$DISTRIB" == MacOS ] ; then OSVesion=VOID_Darwin_EED;
-    elif [ "$DISTRIB" == Fedora  ] ; then OSVersion=`awk 'NR==1{print $3}' /etc/issue`
+    elif [ "$DISTRIB" == Fedora  ] ; then OSVersion=`awk 'NR==1{print $3}' /etc/system-release`
     elif [ "$DISTRIB" == Ubuntu  ] ; then OSVersion=`awk 'NR==1{print $2}' /etc/issue`
     else OSVersion="VOID_EED"
     fi