From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Mon, 9 Feb 2015 15:55:43 +0000 (+0100)
Subject: #2493 creaToolsTools Feature New Normal  -  Prepare and Install binary CreaTools... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=e79d72630bd419d3223605aecbc3ca44360a30f6

#2493 creaToolsTools Feature New Normal  -  Prepare and Install binary CreaTools version - Linux
---

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index e8d5d87..0a96182 100644
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -56,7 +56,7 @@ echo $distanceAdress
 	  echo "##" >> $filename_BinVersion
 
 	  cat creatools_install/share/creatools/Version.sh >> $filename_BinVersion
-	  cat creatools_install/share/creatools/LocalFunctions.sh >> $filename_BinVersion
+	  cat $scriptDir/LocalFunctions.sh >> $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
diff --git a/Linux/scripts/Install-Creatools-Bin.sh b/Linux/scripts/Install-Creatools-Bin.sh
index 7f84f8f..ad06f78 100755
--- a/Linux/scripts/Install-Creatools-Bin.sh
+++ b/Linux/scripts/Install-Creatools-Bin.sh
@@ -42,12 +42,12 @@ OperatingSystem=`getDistrib`
   Mandriva)
      echo Root password:
      su -c "urpmi aria2"
-	  downloadCpmmand=aria2 
+	  downloadCpmmand=aria2c 
      ;;
   Fedora)
      echo Root password:
      su -c "yum install aria2 -y"
-	  downloadCpmmand=aria2 
+	  downloadCpmmand=aria2c
      ;;
   Ubuntu)
      echo Root password:
diff --git a/Linux/scripts/LocalFunctions.sh b/Linux/scripts/LocalFunctions.sh
index 9075cf2..493ce66 100644
--- a/Linux/scripts/LocalFunctions.sh
+++ b/Linux/scripts/LocalFunctions.sh
@@ -87,7 +87,7 @@ function getDownloadCommand {
     local DISTRIB=`getDistrib`
 
       if [ "$DISTRIB" == MacOS ] ; then downloadCommand=curl;
-    elif [ "$DISTRIB" == Fedora  ] ; then downloadCommand=aria -x 16
+    elif [ "$DISTRIB" == Fedora  ] ; then downloadCommand='aria2c -x 16'
     elif [ "$DISTRIB" == Ubuntu  ] ; then downloadCommand=wget
     else downloadCommand="VOID_EED"
     fi