From: davial <davial@localhost.localdomain>
Date: Thu, 1 Jan 2015 10:08:12 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/creaToolsTools
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=inline;h=872e19d0d022a1723ad6ec435be1899105f4f6f6;hp=-c;p=creaToolsTools.git

Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/creaToolsTools
---

872e19d0d022a1723ad6ec435be1899105f4f6f6
diff --combined Linux/installscript
index 9b4bdc0,8b6e977..c8112ea
--- a/Linux/installscript
+++ b/Linux/installscript
@@@ -346,9 -346,9 +346,9 @@@ f
  if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
      bigDisplay "INSTALL PACKAGES DEPENDENCIES"
      source scripts/CreaTools-configure.sh
 -	 cd scripts
 +    cd scripts
      source ThirdParty-install-Base-Stuff.sh $OperatingSystem
 -	 cd ..
 +    cd ..
      bash scripts/ThirdParty-install.sh
  fi
  
@@@ -370,12 -370,9 +370,9 @@@ f
  if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
      bigDisplay "INSTALL $ITKVersion"
      bash scripts/ThirdParty-install-ITK.sh
+     cd $scriptDirName
  fi
  
- ## ??
- #if [ `checkVal $command all 3rd` == true ] ; then
- #    bash scripts/ThirdParty-install.sh
- #fi
  
  # Setup the user .bashrc correctly
  if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
@@@ -391,8 -388,6 +388,8 @@@ f
  # compile creatools
  if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
      bigDisplay "COMPILE CREATOOLS"
 +echo "EED installscript compile creatools"
 +echo $ETC_BASHRC
      source $ETC_BASHRC
      bash -x scripts/CreaTools-compile.sh