curl vs wget

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index eac95568c4cbda35a1062ef2748069282536ace6..9d53565c94392100d420884a99c76c2e21bcd39f 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -100,6 +100,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
@@ -111,7 +112,21 @@ then
          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
@@ -123,6 +138,7 @@ then
          tar xvzf bbtkGEditor.tgz
          tar xvzf creaTools.tgz
          tar xvzf creaMiniTools.tgz
+fi
 
          rm -f *.tgz
       fi

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 1ecbbdcb69533d402dd8bcbbff88c6c603a88e66..ddc242f9edb2adc4056cc85141618f0a117ade07 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -68,8 +68,14 @@ then
   rm -rf $binDir/gdcm*
 
   cd $sourcesDir
+  
+ if [ $OperatingSystem = "MacOS" ]
+ then     
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz 
+ else  
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
-
+ fi
+ 
   tar -xvzf gdcm_05_Mai_2011.tar.gz
 
 fi

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 8a5fa1c4d5855d1606c875866863201645a844a6..5209b995657c412a6575d96663f1b445ee537008 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -141,11 +141,20 @@ then
   rm -rf $binDir/InsightToolkit*
   rm -rf $binDir/VTK*
   cd $sourcesDir
+  
+ if [ $OperatingSystem = "MacOS" ]
+ then    
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+  curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
+else
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
-
+fi  
+  
   tar -xvzf VTK-5.6.1.patchCreatis.tar.gz
   tar -xvzf gdcm_05_Mai_2011.tar.gz
   tar -xvzf InsightToolkit-3.20.0.tar.gz