]> Creatis software - creaToolsTools.git/commitdiff
missing tar
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 15 Jun 2011 15:23:21 +0000 (15:23 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 15 Jun 2011 15:23:21 +0000 (15:23 +0000)
Linux/menu.sh
Linux/scripts/ThirdParty-install-ITK.sh
Linux/scripts/ThirdParty-install-VTK.sh
Linux/scripts/ThirdParty-install-gdcm.sh

index 8ab4e9a4391ecc649c3a46acb41d0d659b71ef7b..f3da99761256d17f8810aec1615b3b58594ad3e0 100644 (file)
@@ -397,8 +397,10 @@ docgeneration="OFF"
 
   1.1)
      echo "========================== 1.1 "
-     source scripts/Check-if-root.sh
-     bash scripts/ThirdParty-install-VTK.sh     
+     source scripts/Check-if-root.sh 
+         read a   
+     bash scripts/ThirdParty-install-VTK.sh
+      read a            
      bash scripts/ThirdParty-install-Finalize.sh      
      read a       
   ;;
index 3d4e271f58227f6f7b0380f6d8699d01da0b78c5..1d05c0402c93be45767c63c87486e47cf2309dab 100644 (file)
@@ -54,6 +54,7 @@ fi
     tar -xvf InsightToolkit-3.20.0.tar.gz
    else
     wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+    tar -xzvf InsightToolkit-3.20.0.tar.gz    
  fi
 
 if [ $buildType = "Debug" ]
index 5d2bf7e7416dcbc114dfe1352bb25d4ec06862a3..985474d397c57252dbb0ec6ba73c0aa5575e6976 100644 (file)
@@ -1,4 +1,6 @@
 #!/bin/bash
+
+echo  "in ThirdParty-onstall-VTK.sh, source " $PWD/scripts/CreaTools-configure.sh
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -13,6 +15,7 @@
    exit 0
 fi
 
+source $PWD/scripts/CreaTools-configure.sh
 
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
@@ -47,7 +50,8 @@ fi
   rm -rf $binDir/VTK*  
   
  cd $sourcesDir
+
+  echo "we download new stuff" 
  if [ $OperatingSystem = "MacOS" ]
    then            
     curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
@@ -55,6 +59,7 @@ fi
     tar -xvf VTK-5.6.1.patchCreatis.tar.gz
    else
     wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+    tar -xzvf VTK-5.6.1.patchCreatis.tar.gz    
  fi
  
 if [ $buildType = "Debug" ]
index 12efd373042c7d44f9d6ce675123250c4da3e56a..a0d65e4487a74fce51d05b876d23ca8a6fb8c139 100644 (file)
@@ -79,12 +79,12 @@ then
 
  if [ $OperatingSystem = "MacOS" ]
  then
-  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/gdcm_05_Mai_2011.tar.gz
+  tar -xvf 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
-
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz 
   tar -xvzf gdcm_05_Mai_2011.tar.gz
+ fi
 
 fi