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

diff --git a/Linux/installscript b/Linux/installscript
index 70fb284..09dbd74 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -145,18 +145,18 @@ configureFile="scripts/CreaTools-configure.sh"
 # default configuration parameters
 OperatingSystem=`getDistrib`
 corenumber=`getncore`
-generationdir=$HOME/CreatoolsGenerationDir
+generationdir=$HOME/Creatis/creaTools
 installPrefixThird=
 installPrefix=
 docgeneration=OFF
-sourcesFrom=HTML
+sourcesFrom=GIT
 
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
-buildType=RelWithDebug
+buildType=Release
 gdcmVersion=GDCM1
 ITKVersion=ITK3
-export ETC_BASHRC=`getbashrc`
+export ETC_BASHRC=~/.bashrc
 
 
 
@@ -175,7 +175,7 @@ function usage {
     echo "    as a normal user:" 
     echo "         config            : set the configuration parameters only" 
     echo "         "                 
-    echo "    as root:" 
+    echo "    need root password:" 
     echo "         3rd               : Get, Compile, Install all 3rd party library "
     echo "         3rd-base          : Install basic tools (cmake, doxygen...)"
     echo "         3rd-vtk           : Get, Compile, Install vtk"
@@ -207,6 +207,7 @@ function usage {
     echo "        -gdir <dir>           : generation directory (default $generationdir)"
     echo "        -instprefix <dir>     : creatools install prefix" 
     echo "        -instprefix3 <dir>    : 3rd party library install prefix" 
+    echo "        -html                 : get creatools from HTML"
     echo "        -git                  : get creatools from git (CREATIS user only)"
     echo "        -git-read-only        : get creatools from git (anonymously, no write access)"
     echo "        -build                : build type Release, RelWithDebug or Debug (default RelWithDebug)"
@@ -229,6 +230,7 @@ while [ $# -ge 1 ] ; do
         -instprefix)        installPrefix=$2;                          shift 2;;
         -instprefix3)       installPrefixThird=$2;                     shift 2;;
         -doc)               docgeneration=ON;                          shift 1;;
+        -html)              sourcesFrom=HTML;                          shift 1;;
         -git)               sourcesFrom=GIT;                           shift 1;;
         -git-read-only)     sourcesFrom=GIT-READ-ONLY;
 shift 1;;
@@ -333,6 +335,12 @@ if [ `checkVal $command config printconfig` == true ] ; then
     exit
 fi
 
+################################################################################## creatools
+# download creatools
+if [ `checkVal $command all creatools creatools-get` == true ] ; then
+    bigDisplay "DOWNLOAD CREATOOLS"
+    bash scripts/CreaTools-load.sh
+fi
 
 ################################################################################## 3rd library
 # install packaged dependencies as root
@@ -380,7 +388,6 @@ fi
 if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
     bigDisplay "FINALIZE 3RD PARTY LIBRARY INSTALLATION"
     bash scripts/ThirdParty-install-Finalize.sh
-    source $ETC_BASHRC
     if [ `checkVal $command 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
         bigDisplay "Third Party Install Done" 
         bigDisplay "Please copy paste the following command or open a new terminal: source ~/.bashrc" 
@@ -388,18 +395,11 @@ if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; th
 fi
 
 ################################################################################## creatools
-
-# download creatools
-if [ `checkVal $command all creatools creatools-get` == true ] ; then
-    bigDisplay "DOWNLOAD CREATOOLS"
-    bash scripts/CreaTools-load.sh
-fi
-
 # compile creatools
 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
@@ -421,10 +421,18 @@ if [ `checkVal $command all creatools creatools-install` == true ] ; then
     source $ETC_BASHRC
     bash scripts/CreaTools-install.sh
     source $ETC_BASHRC
+    echo " "
+    echo " "
+    echo " "
+    echo " "
+    echo "Close this window and continue...."
+    echo " "
+    echo " "
+    echo " "
+    read -p "Press [Enter] key to continue..."
 fi
 
 ################################################################################## uninstall
-
 if [ `checkVal $command uninstall` == true ] ; then
     bigDisplay "UNINSTALL CREATOOLS"
     bash scripts/CreaTools-uninstall.sh