#3446 vtk8itk5wx3-macos in Linux

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index b61cd9f980eea7992f4a7f9959081062f01fecb4..70923a20445dc8c083870434eadfcf40107db897 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,23 +23,37 @@
 
 #!/bin/bash -e
 
-
-#This code is Mac
-function EEDreadlink() {
-  DIR="${1%/*}"
-  (cd "$DIR" && echo "$(pwd -P)")
-}
+#   <<<<<<< HEAD
+#   
+#   #This code is for Mac
+#   function EEDreadlink() {
+#     DIR="${1%/*}"
+#     (cd "$DIR" && echo "$(pwd -P)")
+#   }
+#   
+#   
+#   #EED 2120-08-25  This code is not working in MacOS so we use EEDreadlink()
+#   #EED scriptDirName=$(dirname $(Ereadlink -f $0) )
+#   scriptDirName=$(dirname $(Ereadlink  $0) )/Linux
+#   =======
+#   #EED 2018-08-26
+#   
+#   #scriptDirName=$(dirname $(readlink -f $0) )
+#   scriptDirName=$(pwd)
+#   >>>>>>> origin/vtk8itk5wx3-mingw64
+   scriptDirName=$(pwd)
 
 
-#EED 2120-08-25  This code is not working in MacOS so we use EEDreadlink()
-#EED scriptDirName=$(dirname $(Ereadlink -f $0) )
-scriptDirName=$(dirname $(Ereadlink  $0) )/Linux
-
 #########################################################################
 ############     Local Functions  #######################################
 #########################################################################
 
 
+echo scriptDirName $scriptDirName
+
+
+
+
 source scripts/LocalFunctions.sh
 
 configureFile="scripts/CreaTools-configure.sh"
@@ -54,11 +68,12 @@ installPrefix=
 docgeneration=OFF
 sourcesFrom=GIT
 
+
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=Release
 gdcmVersion=GDCM1
-ITKVersion=ITK3
+ITKVersion=ITK4
 export ETC_BASHRC=`getbashrc`
 TDx=OFF
 
@@ -276,8 +291,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