#3044 creaToolsTools Bug New Normal - Fedora 24 ThirdParty library conflict with...

[creaToolsTools.git] / Linux / scripts / Install-Creatools-Bin.sh

diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh
index 6fc6311e489e58531fd128aabed74a6ce2d0240d..3d569fdb2ef60277ff5550537526da22d05b9610 100755 (executable)
--- a/Linux/scripts/Install-Creatools-Bin.sh
+++ b/Linux/scripts/Install-Creatools-Bin.sh
@@ -28,7 +28,10 @@ function getDistrib {
     local OS=`uname`
 
       if [ "$OS" == Darwin ] ; then OS=MacOS;
-    elif [ "$OS" == Linux  ] ; then OS=`awk 'NR==1{print $1}' /etc/issue`
+##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
@@ -42,17 +45,21 @@ OperatingSystem=`getDistrib`
   Mandriva)
      echo Root password:
      su -c "urpmi aria2"
+         downloadCommand=aria2c 
      ;;
   Fedora)
      echo Root password:
      su -c "yum install aria2 -y"
+         downloadCommand=aria2c
      ;;
   Ubuntu)
      echo Root password:
-     su -c "apt-get --yes install aria2"
+     su -c "apt-get --yes install wget"
+         downloadCommand=wget 
      ;;
   MacOS)
-     port install aria2                -y
+     port install curl -y
+         downloadCommand=curl 
      ;;
   *)
      echo " '$OperatingSystem' : Unknown (for us...) Operating Sytem "
@@ -65,7 +72,7 @@ CREATOOLSBINDIR=Creatools-Bin
 rm -rf $CREATOOLSBINDIR
 mkdir $CREATOOLSBINDIR
 cd $CREATOOLSBINDIR
-aria2c http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/creatools-Linux-Bin.sh
+$downloadCommand http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/creatools-Linux-Bin.sh
 source creatools-Linux-Bin.sh
 cd ..