X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-GenerateBinTGZ.sh;h=af8b84b0c190e45f41d8c455dfa95a6dc7c42aa0;hb=2f8886a7560d88367654a01f5df30180352aec76;hp=d39a7185f014909d18a424bb0d8814a8eeab9a31;hpb=b1c33be17e0eb4a66d0e4581a3f5de1171bb54da;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index d39a718..af8b84b 100644
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -37,16 +37,26 @@
   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
+
+  	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
 
-     tar -cvzf $fileTGZ creatools_install 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