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

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index e8d5d872ef8d358421aca1aaa3b5e89e4c83113e..0a96182d0daf1fd04b2b83fc7086ce90038bcfa7 100644 (file)
--- 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 7f84f8f36701099f6c89bab39a200eafe487ff97..ad06f78d0d532f9283c3794e58b491c42374b412 100755 (executable)
--- 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 9075cf2673dcec9539944b273c2ac46630bfa0c6..493ce661f20b5418b40beae930de4815f2609df5 100644 (file)
--- 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