#2493 creaToolsTools Feature New Normal - Prepare and Install binary CreaTools...

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index 851dce2046dae9c5df81dc4c1ca7c72b558f5814..7c6530ac670b8aad07a93f5901c578255c4f4bfd 100755 (executable)
--- 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 <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;;