#2493 creaToolsTools Feature New Normal - Prepare and Install binary CreaTools...

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index 9c2ef2b2570bb93d6a159b9048ea09e95964fca9..9b4bdc081fbcf64502f06fa03d8a6907fb8e3c7e 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -159,9 +159,6 @@ ITKVersion=ITK3
 export ETC_BASHRC=~/.bashrc
 
 
-
-
-
 function usage {
     echo "installscript [options] command" 
     echo "creatools configure/compile/install script" 
@@ -348,19 +345,13 @@ 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
 
-
-
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
     bigDisplay "INSTALL VTK"
@@ -400,6 +391,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