#3183 creaToolsTools Feature New Normal - install prefix name

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index 7bebda06e1c6eaa36a2eaa90733f999695ec3894..b7c2f492c9209ee9dd3f42ab0e1f1a398675e40a 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -174,8 +174,8 @@ fi
 checkDistrib $OperatingSystem
 
 # complete default install prefix
-if [ -z "$installPrefix" ]      ; then installPrefix=$generationdir/creatools_install; fi
-if [ -z "$installPrefixThird" ] ; then installPrefixThird=$generationdir/thirdparty_install; fi
+if [ -z "$installPrefix" ]      ; then installPrefix=$generationdir/ci; fi
+if [ -z "$installPrefixThird" ] ; then installPrefixThird=$generationdir/tpli; fi
 
 # check build type
 if [ `checkVal $buildType Release Debug RelWithDebug` == "false" ] ; then
@@ -260,13 +260,6 @@ if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     cd $scriptDirName
 fi
 
-# wt
-if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then
-    bigDisplay "INSTALL WT"
-    source scripts/ThirdParty-install-WT.sh
-    cd $scriptDirName
-fi
-
 # itk
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
     bigDisplay "INSTALL $ITKVersion"
@@ -274,6 +267,12 @@ if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
     cd $scriptDirName
 fi
 
+# wt
+if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then
+    bigDisplay "INSTALL WT"
+    source scripts/ThirdParty-install-WT.sh
+    cd $scriptDirName
+fi
 
 # Setup the user .bashrc correctly
 if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx 3rd-wt ` == true ] ; then