X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-load.sh;h=57122327f743f00b05219d28d99e2b90f8e14d8b;hb=1195cf5621f8d7a36af22f32633d443e8d29221d;hp=cff47e6da6c5f47a1454817ef67845e3c031e161;hpb=646380fa17cf687bb4703301ec71db999342aa4a;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index cff47e6..5712232 100644
--- 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
 
@@ -104,31 +104,54 @@ then
    #if [ true = false ]
    then
 #
-      if [ $sourcesFrom = GIT ]
+      if [ $sourcesFrom = GIT ] || [ $sourcesFrom = GIT-READ-ONLY ];
       then
-         bash $scriptDir/gitclone.sh $creasource                   $generationdir $gitUserName
-         bash $scriptDir/gitclone.sh $bbtksource                   $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creamaracassource            $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creabrukersource             $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creaimagesource              $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creacontourssource           $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $crearigidregistrationssource $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $bbtkgeditorsource            $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creatoolssource              $generationdir $gitUserName
-         bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir $gitUserName
- #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF            $generationdir $cvsUserName
- #	       mv $libidosource-ESRF $libidosource	 	 
+		 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 
+         bash $scriptDir/gitclone.sh $creaimagesource              $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $creacontourssource           $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $crearigidregistrationssource $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $bbtkgeditorsource            $generationdir	$sourcesFrom 
+         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
+ #	 mv $libidosource-ESRF $libidosource	 	 
+          
+         cd $generationdir/creatools_source/$creasource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$bbtksource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creavtksource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creamaracassource
+		 git checkout vtk8itk5wx3-macos
+		 cd $generationdir/creatools_source/$creabrukersource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creaimagesource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creacontourssource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$crearigidregistrationssource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$bbtkgeditorsource
+		 git checkout vtk8itk5wx3-macos
+         cd $generationdir/creatools_source/$creatoolssource
+		 git checkout vtk8itk5wx3-macos
       fi
 
       if [ $sourcesFrom = HTML ]
       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
@@ -143,6 +166,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
@@ -155,6 +179,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
@@ -165,7 +190,6 @@ then
          tar xvzf creaTools.tgz
          tar xvzf creaMiniTools.tgz
 fi
-
          rm -f *.tgz
       fi
    fi