From 226677f5b7419d7bfdf7914b338af561d675605d Mon Sep 17 00:00:00 2001
From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 9 Feb 2015 16:16:03 +0100
Subject: [PATCH] #2493 creaToolsTools Feature New Normal  -  Prepare and
 Install binary CreaTools version - Linux

---
 Linux/scripts/CreaTools-GenerateBinTGZ.sh |  2 +-
 Linux/scripts/Install-Creatools-Bin.sh    | 10 +++++++---
 Linux/scripts/LocalFunctions.sh           | 13 +++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index d39a718..e8d5d87 100644
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -58,7 +58,7 @@ echo $distanceAdress
 	  cat creatools_install/share/creatools/Version.sh >> $filename_BinVersion
 	  cat creatools_install/share/creatools/LocalFunctions.sh >> $filename_BinVersion
 
-	  echo "aria2c -x 16 http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.\$creatoolsMinorVersion.x/$fileTGZstring.tgz" >> $filename_BinVersion 
+	  echo "\`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.\$creatoolsMinorVersion.x/$fileTGZstring.tgz" >> $filename_BinVersion 
 	  echo "tar -xvzf $fileTGZstring.tgz" >>  $filename_BinVersion
 	  echo "rm -f $fileTGZstring.tgz" >>  $filename_BinVersion
 	 
diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh
index 6fc6311..7f84f8f 100755
--- a/Linux/scripts/Install-Creatools-Bin.sh
+++ b/Linux/scripts/Install-Creatools-Bin.sh
@@ -42,17 +42,21 @@ OperatingSystem=`getDistrib`
   Mandriva)
      echo Root password:
      su -c "urpmi aria2"
+	  downloadCpmmand=aria2 
      ;;
   Fedora)
      echo Root password:
      su -c "yum install aria2 -y"
+	  downloadCpmmand=aria2 
      ;;
   Ubuntu)
      echo Root password:
-     su -c "apt-get --yes install aria2"
+     su -c "apt-get --yes install wget"
+	  downloadCpmmand=wget 
      ;;
   MacOS)
-     port install aria2                -y
+     port install curl -y
+	  downloadCpmmand=curl 
      ;;
   *)
      echo " '$OperatingSystem' : Unknown (for us...) Operating Sytem "
@@ -65,7 +69,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
+$downloadCpmmand http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/creatools-Linux-Bin.sh
 source creatools-Linux-Bin.sh
 cd ..
 
diff --git a/Linux/scripts/LocalFunctions.sh b/Linux/scripts/LocalFunctions.sh
index c84fca4..9075cf2 100644
--- a/Linux/scripts/LocalFunctions.sh
+++ b/Linux/scripts/LocalFunctions.sh
@@ -82,6 +82,18 @@ function getDistribVersion {
     echo $OSVersion
 }
 
+###########################################
+function getDownloadCommand {
+    local DISTRIB=`getDistrib`
+
+      if [ "$DISTRIB" == MacOS ] ; then downloadCommand=curl;
+    elif [ "$DISTRIB" == Fedora  ] ; then downloadCommand=aria -x 16
+    elif [ "$DISTRIB" == Ubuntu  ] ; then downloadCommand=wget
+    else downloadCommand="VOID_EED"
+    fi
+    echo $downloadCommand
+}
+
 ###########################################
 function getncore {
     if [ `uname` == Darwin ] ; then # MacOS
@@ -113,6 +125,7 @@ function getbashrc {
 #    fi
 }
 
+
 ###########################################
 function printconfig {
     echo
-- 
2.44.0