X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=09dbd74192b1a61dda716853c2f89952d85fcfdb;hb=f3ad98c62414e3eb28d8f0330cc16e4e3708e508;hp=851dce2046dae9c5df81dc4c1ca7c72b558f5814;hpb=5eb2abdf96b753be13fd8bb56217f357c066e941;p=creaToolsTools.git
diff --git a/Linux/installscript b/Linux/installscript
index 851dce2..09dbd74 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -145,7 +145,7 @@ configureFile="scripts/CreaTools-configure.sh"
# default configuration parameters
OperatingSystem=`getDistrib`
corenumber=`getncore`
-generationdir=$HOME/CreatoolsGenerationDir
+generationdir=$HOME/Creatis/creaTools
installPrefixThird=
installPrefix=
docgeneration=OFF
@@ -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
: generation directory (default $generationdir)"
echo " -instprefix : creatools install prefix"
echo " -instprefix3 : 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
@@ -387,13 +395,6 @@ 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"
@@ -420,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