From: Eduardo DAVILA Date: Wed, 18 May 2016 21:25:24 +0000 (+0200) Subject: #2786 creaToolsTools Bug New Normal - Fedora 23 - Not recognition of Linux distritution X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=a92742a3051a3e7a44178afecdb4f6e267a2fdfd #2786 creaToolsTools Bug New Normal - Fedora 23 - Not recognition of Linux distritution --- diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh index da113ec..6482e11 100755 --- a/Linux/scripts/Install-Creatools-Bin.sh +++ b/Linux/scripts/Install-Creatools-Bin.sh @@ -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 diff --git a/Linux/scripts/LocalFunctions.sh b/Linux/scripts/LocalFunctions.sh index 493ce66..b9694a0 100644 --- a/Linux/scripts/LocalFunctions.sh +++ b/Linux/scripts/LocalFunctions.sh @@ -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