From af5c3e4b663ae6b439603680bcccd42182fc2adf Mon Sep 17 00:00:00 2001
From: davila <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 26 Dec 2014 08:42:06 +0100
Subject: [PATCH] #2493 creaToolsTools Feature New Normal  -  Prepare and
 Install binary CreaTools version - Linux

---
 Linux/installscript             | 14 ++++++--------
 Linux/scripts/CreaTools-load.sh |  7 ++-----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Linux/installscript b/Linux/installscript
index 7c6530a..51cd51b 100755
--- 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 08112a8..d85a4b4 100644
--- 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
-- 
2.47.1