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

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index b8b983b..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
@@ -89,7 +89,7 @@ then
   rm -rf creatools_source
   rm -rf creatools_bin
   rm -rf creatools_install
-  mkdir $generationdir/creatools_source
+  mkdir -p $generationdir/creatools_source
 fi
 fi
 
@@ -106,10 +106,10 @@ then
 #
       if [ $sourcesFrom = GIT ] || [ $sourcesFrom = GIT-READ-ONLY ];
       then
-			ssh-add
+		 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,16 +120,35 @@ 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
- #	       mv $libidosource-ESRF $libidosource	 	 
+ #       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
@@ -171,7 +190,6 @@ then
          tar xvzf creaTools.tgz
          tar xvzf creaMiniTools.tgz
 fi
-
          rm -f *.tgz
       fi
    fi