X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fscripts%2FThirdParty-install-ITK.sh;h=b8a79b79d10b203206d1fa6f9561a455d0c35b0e;hb=9f43cd159e6f7dd21ec18f33cc9d962db3b1a8e5;hp=858c58313e0e5ff66f2fbd1057e9efe70f5b0ee7;hpb=ddeaaa3cf36ba886126295f9930b28840f61f6e6;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 858c583..b8a79b7 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -48,6 +48,7 @@ source $PWD/scripts/CreaTools-configure.sh
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
+itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
 
 if [ ! -e $generationdir ]
 then
@@ -86,24 +87,23 @@ fi
  echo "we download new stuff"
   if [ $ITKVersion = ITK3 ]
   then
-  #  deal with ITK3
-     if [ $OperatingSystem = "MacOS" ]
-     then
-        curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.patchCreatis.tar.gz
-     else
-        wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.patchCreatis.tar.gz
-     fi
-     tar -xzvf InsightToolkit-3.20.0.tar.gz
+     # deal with ITK3
+     itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
+     libname=InsightToolkit-3.20.0
   else
-    #  deal with ITK4
-    if [ $OperatingSystem = "MacOS" ]
+    # deal with ITK4
+    itkfile=ITK4.0.tgz
+    libname=ITK
+  fi
+
+  if [ $OperatingSystem = "MacOS" ]
     then
-       curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/ITK4.0.tgz
-    else
-       wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/ITK4.0.tgz
-    fi
-    tar -xzvf ITK4.0.tgz
+      curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
+  else
+      wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
   fi
+  tar -xzvf $itkfile
+
 
 #fi # JPR ------------1
 
@@ -118,12 +118,6 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  if [ $ITKVersion = ITK3 ]
-  then
-     libname=InsightToolkit-3.20.0
-  else
-     libname=ITK
-  fi
 
   dirInstall=$binDir/$libname-Bin
   export ITK_DIR=$installPrefixThird/lib/InsightToolkit/