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

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

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 2a5283389b61ac913b15a1fdf26aa5d7cf3704d7..d85a4b4589871f2c61f1c32a61dd7d521842a450 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -69,10 +69,10 @@ fi
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   mkdir $generationdir/creatools_source
-   mkdir $generationdir/creatools_bin
-   mkdir $generationdir/creatools_install   
+   mkdir -p $generationdir
+   mkdir -p $generationdir/creatools_source
+   mkdir -p $generationdir/creatools_bin
+   mkdir -p $generationdir/creatools_install   
 fi
 
 cd $generationdir
@@ -86,10 +86,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
-#  rm -rf creatools_bin
-#  mkdir $generationdir/creatools_bin
   rm -rf creatools_source
-  mkdir $generationdir/creatools_source
+  rm -rf creatools_bin
+  rm -rf creatools_install
+  mkdir -p $generationdir/creatools_source
 fi
 fi
 
@@ -106,8 +106,10 @@ then
 #
       if [ $sourcesFrom = GIT ] || [ $sourcesFrom = GIT-READ-ONLY ];
       then
+                       ssh-add
          bash $scriptDir/gitclone.sh $creasource                   $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $bbtksource                   $generationdir      $sourcesFrom
+         bash $scriptDir/gitclone.sh $creavtksource                   $generationdir   $sourcesFrom 
          bash $scriptDir/gitclone.sh $creamaracassource            $generationdir      $sourcesFrom 
          bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir      $sourcesFrom 
          bash $scriptDir/gitclone.sh $creabrukersource             $generationdir      $sourcesFrom 
@@ -118,7 +120,7 @@ then
          bash $scriptDir/gitclone.sh $creatoolssource              $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir      $sourcesFrom
          bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir      $sourcesFrom
- #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF            $generationdir $cvsUserName
+ #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF         $generationdir   $cvsUserName
  #            mv $libidosource-ESRF $libidosource               
       fi
 
@@ -126,10 +128,9 @@ then
       then
          cd $generationdir/creatools_source
          wwwtargz=http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/nightly/
-
-
          wget $wwwtargz/crea.tgz
          wget $wwwtargz/bbtk.tgz
+         wget $wwwtargz/creaVtk.tgz
          wget $wwwtargz/creaMaracasVisu.tgz
          wget $wwwtargz/creaEnvironment.tgz
          wget $wwwtargz/creaBruker.tgz
@@ -144,6 +145,7 @@ then
  then                           
          curl $wwwtargz/crea.tgz
          curl $wwwtargz/bbtk.tgz
+         curl $wwwtargz/creaVtk.tgz
          curl $wwwtargz/creaMaracasVisu.tgz
          curl $wwwtargz/creaEnvironment.tgz
          curl $wwwtargz/creaBruker.tgz
@@ -156,6 +158,7 @@ then
  else   
          tar xvzf crea.tgz
          tar xvzf bbtk.tgz
+         tar xvzf creaVtk.tgz
          tar xvzf creaMaracasVisu.tgz
          tar xvzf creaEnvironment.tgz           
          tar xvzf creaBruker.tgz
@@ -166,7 +169,6 @@ then
          tar xvzf creaTools.tgz
          tar xvzf creaMiniTools.tgz
 fi
-
          rm -f *.tgz
       fi
    fi