X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=7c6530ac670b8aad07a93f5901c578255c4f4bfd;hb=fd2aac7e56a2ae4ecd5ed98deec488f6dbbedc1b;hp=8f9ae93b93e8eb73374a896621139a1eec0687f6;hpb=1c504ce22d2ad945d8ead7ee7df63284a9830a56;p=creaToolsTools.git

diff --git a/Linux/installscript b/Linux/installscript
index 8f9ae93..7c6530a 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,6 +23,8 @@
 
 #!/bin/bash -e
 
+scriptDirName=$(dirname $(readlink -f $0) )
+
 #########################################################################
 ############     Local Functions  #######################################
 #########################################################################
@@ -143,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
 
 
 
@@ -173,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"
@@ -205,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)"
@@ -227,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;;
@@ -337,26 +341,30 @@ fi
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
     if [ "`whoami`" == root ] ; then
-        bash scripts/ThirdParty-install-Base-Stuff.sh
+       echo ThirdParty-install-Base-Stuff
+       bash scripts/ThirdParty-install-Base-Stuff.sh
     else 
         # must log as root
         echo "Please enter the root passwd to add necessary packages:"; 
-        sudo su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
+        su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
     fi
     bash scripts/ThirdParty-install.sh
 fi
 
 
+
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
     bigDisplay "INSTALL VTK"
-    bash scripts/ThirdParty-install-VTK.sh
+    source scripts/ThirdParty-install-VTK.sh
+    cd $scriptDirName
 fi
 
 # gdcm
 if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     bigDisplay "INSTALL $gdcmVersion"
-    bash scripts/ThirdParty-install-gdcm.sh
+    source scripts/ThirdParty-install-gdcm.sh
+    cd $scriptDirName
 fi
 
 # itk
@@ -374,7 +382,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"