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

diff --combined Linux/installscript
index 9b4bdc081fbcf64502f06fa03d8a6907fb8e3c7e,8b6e9779348b6efeb589ed604e79caaf4f2efaf1..c8112ea419f088a586410ff75110cdebe057230c
--- 1/Linux/installscript
--- 2/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