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

diff --git a/Linux/installscript b/Linux/installscript
index 7c6530ac670b8aad07a93f5901c578255c4f4bfd..51cd51b6489a0c5d36b8f1057af18b60a2c99cbd 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -335,6 +335,12 @@ if [ `checkVal $command config printconfig` == true ] ; then
     exit
 fi
 
+################################################################################## creatools
+# download creatools
+if [ `checkVal $command all creatools creatools-get` == true ] ; then
+    bigDisplay "DOWNLOAD CREATOOLS"
+    bash scripts/CreaTools-load.sh
+fi
 
 ################################################################################## 3rd library
 # install packaged dependencies as root
@@ -389,13 +395,6 @@ if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; th
 fi
 
 ################################################################################## creatools
-
-# download creatools
-if [ `checkVal $command all creatools creatools-get` == true ] ; then
-    bigDisplay "DOWNLOAD CREATOOLS"
-    bash scripts/CreaTools-load.sh
-fi
-
 # compile creatools
 if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
     bigDisplay "COMPILE CREATOOLS"
@@ -425,7 +424,6 @@ if [ `checkVal $command all creatools creatools-install` == true ] ; then
 fi
 
 ################################################################################## uninstall
-
 if [ `checkVal $command uninstall` == true ] ; then
     bigDisplay "UNINSTALL CREATOOLS"
     bash scripts/CreaTools-uninstall.sh 

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 08112a875584e2dec4da6e69c17d8f1b13a2095a..d85a4b4589871f2c61f1c32a61dd7d521842a450 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -109,7 +109,7 @@ 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 $creavtksource                   $generationdir   $sourcesFrom 
          bash $scriptDir/gitclone.sh $creamaracassource            $generationdir      $sourcesFrom 
          bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir      $sourcesFrom 
          bash $scriptDir/gitclone.sh $creabrukersource             $generationdir      $sourcesFrom 
@@ -120,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
 
@@ -128,8 +128,6 @@ 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
@@ -171,7 +169,6 @@ then
          tar xvzf creaTools.tgz
          tar xvzf creaMiniTools.tgz
 fi
-
          rm -f *.tgz
       fi
    fi