X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fscripts%2FLocalFunctions.sh;h=90624a24f2901c36625ebf4fe142fc741f9113bf;hb=6fcb57eef26e08422fba5b08b6bd7119e9b59d7d;hp=493ce661f20b5418b40beae930de4815f2609df5;hpb=e79d72630bd419d3223605aecbc3ca44360a30f6;p=creaToolsTools.git diff --git a/Linux/scripts/LocalFunctions.sh b/Linux/scripts/LocalFunctions.sh index 493ce66..90624a2 100644 --- a/Linux/scripts/LocalFunctions.sh +++ b/Linux/scripts/LocalFunctions.sh @@ -62,8 +62,10 @@ function checkDistrib { function getDistrib { local OS=`uname` - if [ "$OS" == Darwin ] ; then OS=MacOS; - elif [ "$OS" == Linux ] ; then OS=`awk 'NR==1{print $1}' /etc/issue` + if [ "$OS" == Darwin ] ; then OS=MacOS; +##EED2016-10-15 +## elif [ "$OS" == Linux ] ; then OS=$(lsb_release -i | awk '{print $3}') + elif [ "$OS" == Linux ] ; then OS=`awk 'NR==1{print $1}' /etc/system-release` else OS="" fi # checkDistrib $OS @@ -75,7 +77,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