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

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index 4263b5b..d39a718 100644
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -27,38 +27,57 @@
 #if [ $UID = 0 ] 
 #then
   # Set all local variables
-  source $PWD/scripts/LocalFunctions.sh
-  source $PWD/scripts/CreaTools-configure.sh
+  scriptDir=`pwd`/scripts
+##  cd $scriptsDir
+  source scripts/LocalFunctions.sh
+##  cd $scriptsDir
+  source scripts/CreaTools-configure.sh
+
+
   if [ -e $generationdir ]
   then
 
 	  cd $generationdir
   	  source creatools_install/share/creatools/Version.sh 
-     fileTGZ=CreaTools-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz
+	  distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
+echo distanceAdress:
+echo $distanceAdress
+
+     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
-	  scp $fileTGZ tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/$fileTGZ 
+	  scp $fileTGZ $distanceAdress/$fileTGZ 
 
-	  filename_BinVersion=creatools-Linux-BinVersion-`getDistrib`-`getDistribVersion`.sh
+	  filename_BinVersion=creatools-Linux-Bin-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
 
 	  echo "##" > $filename_BinVersion
 	  echo "## Generated by CreaTools-GeneratedBinTGZ.sh" >> $filename_BinVersion
 	  echo "##" >> $filename_BinVersion
 
-	  echo "wget http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/$fileTGZ" >> $filename_BinVersion 
-	  echo "tar -xvzf $fileTGZ" >>  $filename_BinVersion
+	  cat creatools_install/share/creatools/Version.sh >> $filename_BinVersion
+	  cat creatools_install/share/creatools/LocalFunctions.sh >> $filename_BinVersion
 
-     echo "source 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 "tar -xvzf $fileTGZstring.tgz" >>  $filename_BinVersion
+	  echo "rm -f $fileTGZstring.tgz" >>  $filename_BinVersion
+	 
+
+#EED     echo "source creatools_install/share/creatools/LocalFunctions.sh"  >>  $filename_BinVersion
      echo "ETC_BASHRC=\`getbashrc\`" >>  $filename_BinVersion
      echo "installPrefix=\$(pwd)/creatools_install #You need this variable in the -barshrc script" >>  $filename_BinVersion
      echo "installPrefixThird=\$(pwd)/thirdparty_install #You need this variable in the -barshrc script" >>  $filename_BinVersion
      echo "OperatingSystem=\`getDistrib\`  #You need this variable in the Base-Stuff script" >>  $filename_BinVersion
 
      echo "cd thirdparty_install/share/creatools/"  >>  $filename_BinVersion
-     echo "source ThirdParty-install-Base-Stuff.sh $OperatingSystem"  >>  $filename_BinVersion
+     echo "source ThirdParty-install-Base-Stuff.sh \$OperatingSystem"  >>  $filename_BinVersion
      echo "cd ../../.."  >>  $filename_BinVersion
+
      echo "source thirdparty_install/share/creatools/ThirdParty-bashrc.sh"  >>  $filename_BinVersion
      echo "source creatools_install/share/creatools/CreaTools-bashrc.sh"  >>  $filename_BinVersion
+
+     echo "echo $fileTGZstring >> Creatools-Bin-Version.txt " >>  $filename_BinVersion
+
      echo "echo  " >>  $filename_BinVersion
      echo "echo  " >>  $filename_BinVersion
      echo "echo  " >>  $filename_BinVersion
@@ -68,9 +87,17 @@
      echo "echo  " >>  $filename_BinVersion
      echo "echo  " >>  $filename_BinVersion
      echo "echo  Install dir:" >>  $filename_BinVersion
-     echo "pwd" >>  $filename_BinVersion
+     echo "pwd"    >>  $filename_BinVersion
+     echo "echo  " >>  $filename_BinVersion
      echo "read -p 'Press [Enter] key to continue...'" >>  $filename_BinVersion
-     scp $filename_BinVersion tux.creatis.insa-lyon.fr:creatools/creaTools/. 
+     scp $filename_BinVersion $distanceAdress/. 
+
+     cd $scriptsDir
+     scp $scriptDir/Install-Creatools-Bin.sh $distanceAdress/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
+	  
+	  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 creatools-Linux-Bin.sh;  ln -s v2.6.x/$filename_BinVersion  creatools-Linux-Bin.sh"
 
      echo ""
      echo ""
@@ -78,7 +105,8 @@
      echo "Creation OK:"
      echo $fileTGZ
      echo ""
-
+     echo $PWD
+	
   else
    echo
    echo "..ERROR.."