Merge branch 'vtk8itk4w3-macos' into vtk8itk4wx3-mingw64

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index 2631d2bd5796dce732a128a8d316154fdf22289b..b03ad1bdcbee9a9f913b125d24ced53d2470d65f 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,7 +23,10 @@
 
 #!/bin/bash -e
 
-scriptDirName=$(dirname $(readlink -f $0) )
+#EED 2018-08-26
+
+#scriptDirName=$(dirname $(readlink -f $0) )
+scriptDirName=$(pwd)
 
 #########################################################################
 ############     Local Functions  #######################################
@@ -38,12 +41,14 @@ configureFile="scripts/CreaTools-configure.sh"
 # default configuration parameters
 OperatingSystem=`getDistrib`
 corenumber=`getncore`
+echo "hola1"
 generationdir=$HOME/Creatis/creaTools
 installPrefixThird=
 installPrefix=
 docgeneration=OFF
 sourcesFrom=GIT
 
+
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=Release
@@ -248,9 +253,9 @@ fi
 
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
-    bigDisplay "INSTALL VTK"
-    source scripts/ThirdParty-install-VTK.sh
-    cd $scriptDirName
+           bigDisplay "INSTALL VTK"
+               source scripts/ThirdParty-install-VTK.sh
+       cd $scriptDirName
 fi
 
 # gdcm
@@ -262,8 +267,8 @@ fi
 
 # itk
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
-    bigDisplay "INSTALL $ITKVersion"
-    bash scripts/ThirdParty-install-ITK.sh
+       bigDisplay "INSTALL $ITKVersion"
+       bash scripts/ThirdParty-install-ITK.sh
     cd $scriptDirName
 fi