X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-load.sh;h=cc5bac021efafba951607b6fb92005b9767d66f5;hb=c7cbdaae00e1c26ca7b0a862a6198b204bcb797d;hp=a15d146f29f220d42b68993d0f848da479588a69;hpb=50abbf7beebb9762439fd30f85eb6c11e11d680d;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index a15d146..cc5bac0 100644
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Set all local variables
 
@@ -19,6 +19,8 @@
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo "--ETC_BASHRC--"
+   echo $ETC_BASHRC
    echo --sourcesFrom--
    echo $sourcesFrom
    echo --scriptDir--
@@ -46,6 +48,7 @@ then
    mkdir $generationdir
    mkdir $generationdir/creatools_source
    mkdir $generationdir/creatools_bin
+   mkdir $generationdir/creatools_install   
 fi
 
 cd $generationdir
@@ -79,16 +82,19 @@ then
 #
       if [ $sourcesFrom = CVS ]
       then
-         sh $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
-         sh $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
+         bash $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName 
+         bash $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName
+         bash $scriptDir/cvscheckout.sh $creaminitoolssource          $generationdir $cvsUserName
+ #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF            $generationdir $cvsUserName
+ #	       mv $libidosource-ESRF $libidosource	 	 
       fi
 
       if [ $sourcesFrom = HTML ]
@@ -96,6 +102,7 @@ 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/creaMaracasVisu.tgz
@@ -106,7 +113,22 @@ then
          wget $wwwtargz/creaRigidRegistration.tgz
          wget $wwwtargz/bbtkGEditor.tgz
          wget $wwwtargz/creaTools.tgz
-	 	    	 
+         wget $wwwtargz/creaMiniTools.tgz
+	 
+ if [ $OperatingSystem = "MacOS" ]
+ then	 	 	    	 
+         curl $wwwtargz/crea.tgz
+         curl $wwwtargz/bbtk.tgz
+         curl $wwwtargz/creaMaracasVisu.tgz
+         curl $wwwtargz/creaEnvironment.tgz
+         curl $wwwtargz/creaBruker.tgz
+         curl $wwwtargz/creaImageIO.tgz
+         curl $wwwtargz/creaContours.tgz
+         curl $wwwtargz/creaRigidRegistration.tgz
+         curl $wwwtargz/bbtkGEditor.tgz
+         curl $wwwtargz/creaTools.tgz
+         curl $wwwtargz/creaMiniTools.tgz
+ else	 
          tar xvzf crea.tgz
          tar xvzf bbtk.tgz
          tar xvzf creaMaracasVisu.tgz
@@ -117,6 +139,8 @@ then
          tar xvzf creaRigidRegistration.tgz
          tar xvzf bbtkGEditor.tgz
          tar xvzf creaTools.tgz
+         tar xvzf creaMiniTools.tgz
+fi
 
          rm -f *.tgz
       fi