#3053 creaToolsTools Bug New Normal - GeneratyBinTgz creatools_install thirdpary_in...

[creaToolsTools.git] / Linux / scripts / CreaTools-GenerateBinTGZ.sh

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 5c77067293718ddf8dd941390d5d36397d1daa7b..af8b84b0c190e45f41d8c455dfa95a6dc7c42aa0 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -37,17 +37,27 @@
   if [ -e $generationdir ]
   then
 
-         cd $generationdir
-         source creatools_install/share/creatools/Version.sh 
-         distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
-echo distanceAdress:
-echo $distanceAdress
+       echo generationdir:
+       echo $generationdir
+       cd $generationdir
+       mkdir GenerateBinTGZ
+    cd GenerateBinTGZ
 
-     fileTGZ=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz
-         fileTGZstring=CreaTools-Bin-Release-\$creatoolsMajorVersion.\$creatoolsMinorVersion.\$creatoolsBuildVersion-\`getDistrib\`-\`getDistribVersion\`
+       ln -s $installPrefix creatools_install
+       ln -s $installPrefixThird thirdparty_install
 
- ##EED    tar -cvzf $fileTGZ creatools_install thirdparty_install
-##EED    scp $fileTGZ $distanceAdress/$fileTGZ 
+       source creatools_install/share/creatools/Version.sh 
+       distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
+
+       fileTGZ=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz
+       fileTGZstring=CreaTools-Bin-Release-\$creatoolsMajorVersion.\$creatoolsMinorVersion.\$creatoolsBuildVersion-\`getDistrib\`-\`getDistribVersion\`
+
+     tar -cvzf $fileTGZ creatools_install/* thirdparty_install/*
+
+      rm creatools_install
+      rm thirdparty_install
+
+         scp $fileTGZ $distanceAdress/$fileTGZ 
 
          filename_BinVersion=creatools-Linux-Bin-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
 
@@ -56,9 +66,9 @@ 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 "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
         
@@ -97,7 +107,7 @@ echo $distanceAdress
          
          ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh;  ln -s v2.6.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh  Install-Creatools-Bin-Release.sh"
 
-         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm $filename_BinVersion;  ln -s v2.6.x/$filename_BinVersion  creatools-Linux-Bin.sh"
+         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh;  ln -s v2.6.x/$filename_BinVersion  creatools-Linux-Bin.sh"
 
      echo ""
      echo ""