#3183 creaToolsTools Feature New Normal - install prefix name

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index b5209a52ddd30bd02a296e05f943fdd2e44ce87c..b7c2f492c9209ee9dd3f42ab0e1f1a398675e40a 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -72,6 +72,7 @@ function usage {
     echo "         3rd-itk                   : Get, Compile, Install itk"
     echo "         3rd-gdcm                  : Get, Compile, Install gdcm"
     echo "         3rd-wx                    : Get, Compile, Install wx widget (for Mac Users)"
+    echo "         3rd-wt                    : Get, Compile, Install wt"
     echo "   "
     echo "    as a normal user:" 
     echo "         creatools                 : Get Compile and Install the CreaTools"
@@ -138,7 +139,7 @@ if [ $# -le 0 ] ; then usage; fi
 command=$1
 
 # check that command is valid
-if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx creatools creatools-get creatools-cmp creatools-install creatools-generateBinTGZ uninstall printconfig help env` == "false" ] ; then
+if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx 3rd-wt creatools creatools-get creatools-cmp creatools-install creatools-generateBinTGZ uninstall printconfig help env` == "false" ] ; then
     echo "Unrecognized command: $command"
     echo ""
     usage
@@ -153,7 +154,7 @@ if [ `checkVal $command config all` == false ] ; then
         exit
     fi
     source $configureFile
-    if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ] ; then
+    if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ] ; then
         echo WARNING
         echo "the curently used Third Party libraries are NOT in $installPrefixThird but ... in :"
         grep "installPrefixThird=" $ETC_BASHRC
@@ -173,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
@@ -266,9 +267,15 @@ 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 ` == true ] ; then
+if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx 3rd-wt ` == true ] ; then
     bigDisplay "FINALIZE 3RD PARTY LIBRARY INSTALLATION"
     bash scripts/ThirdParty-install-Finalize.sh
     if [ `checkVal $command 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
@@ -314,7 +321,7 @@ if [ `checkVal $command all creatools creatools-install` == true ] ; then
     echo "(Close this window and continue....) "
     echo " "
     echo " "
-    read -p "Press [Enter] key to continue..."
+    ##EED read -p "Press [Enter] key to continue..."
 fi
 
 #generate TGZ version of the bin (Creatools and ThirdParty)