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

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index ee91e138a03697681200009eef8ce56982137ad7..c8112ea419f088a586410ff75110cdebe057230c 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -345,14 +345,10 @@ fi
 # install packaged dependencies as root
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
-    if [ "`whoami`" == root ] ; then
-       echo ThirdParty-install-Base-Stuff
-       bash scripts/ThirdParty-install-Base-Stuff.sh
-    else 
-        # must log as root
-        echo "Please enter the root passwd to add necessary packages:"; 
-        su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
-    fi
+    source scripts/CreaTools-configure.sh
+    cd scripts
+    source ThirdParty-install-Base-Stuff.sh $OperatingSystem
+    cd ..
     bash scripts/ThirdParty-install.sh
 fi
 
@@ -374,12 +370,9 @@ fi
 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
@@ -395,6 +388,8 @@ fi
 # 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