X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=70fb2846b2fff369df4bc54e9d45b91e0d15c5bb;hb=f513924db3c927ac3c0e765731487572f25fcf1c;hp=8f9ae93b93e8eb73374a896621139a1eec0687f6;hpb=1c504ce22d2ad945d8ead7ee7df63284a9830a56;p=creaToolsTools.git

diff --git a/Linux/installscript b/Linux/installscript
index 8f9ae93..70fb284 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,6 +23,8 @@
 
 #!/bin/bash -e
 
+scriptDirName=$(dirname $(readlink -f $0) )
+
 #########################################################################
 ############     Local Functions  #######################################
 #########################################################################
@@ -337,26 +339,30 @@ fi
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
     if [ "`whoami`" == root ] ; then
-        bash scripts/ThirdParty-install-Base-Stuff.sh
+       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:"; 
-        sudo su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
+        su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
     fi
     bash scripts/ThirdParty-install.sh
 fi
 
 
+
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
     bigDisplay "INSTALL VTK"
-    bash scripts/ThirdParty-install-VTK.sh
+    source scripts/ThirdParty-install-VTK.sh
+    cd $scriptDirName
 fi
 
 # gdcm
 if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     bigDisplay "INSTALL $gdcmVersion"
-    bash scripts/ThirdParty-install-gdcm.sh
+    source scripts/ThirdParty-install-gdcm.sh
+    cd $scriptDirName
 fi
 
 # itk
@@ -393,7 +399,7 @@ fi
 if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
     bigDisplay "COMPILE CREATOOLS"
     source $ETC_BASHRC
-    bash -x scripts/CreaTools-compile.sh
+   bash -x scripts/CreaTools-compile.sh
 
     # To allow (*very* aware) user to patch code, later
     if [ ! -e $generationdir/creatools_source ] ; then