X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=c65468e096a536de700c59c0c3497714ba6d2bb8;hb=74c39dff7bad2a793f7dbad0b1636e0ca12fe514;hp=d861e39d25dbacd65717cb62788a9ad7ddc79fa3;hpb=c6a324a9e343fcd992fc3e73e886bc0323d5c0a7;p=creaToolsTools.git

diff --git a/Linux/installscript b/Linux/installscript
index d861e39..c65468e 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -119,9 +119,6 @@ function printconfig {
     echo "  Install Prefix for CreaTools               : $installPrefix"
     echo "  Boolean for Doc Generation                 : $docgeneration"
     echo "  Where do you want to get source files from : $sourcesFrom"
-    if [ $sourcesFrom = CVS ] ; then
-    echo "  CVS User Name                              : $cvsUserName"
-    fi
     echo "  Login User Name                            : $loginUserName"
     echo "  Login Group Name                           : $loginGroupName"
     echo "  Build type                                 : $buildType"          
@@ -152,7 +149,6 @@ installPrefix=
 docgeneration=OFF
 sourcesFrom=HTML
 
-cvsUserName=
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=RelWithDebug
@@ -165,7 +161,7 @@ export ETC_BASHRC=`getbashrc`
 
 
 function usage {
-    echo "menu.sh [options] command" 
+    echo "installscript [options] command" 
     echo "creatools configure/compile/install script" 
     echo "" 
     echo "" 
@@ -204,7 +200,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 "        -cvs <cvsusername>    : get creatools from cvs (CREATIS user only)"
+    echo "        -git                  : get creatools from git (CREATIS user only)"
     echo "        -build                : build type Release, RelWithDebug or Debug (default RelWithDebug)"
     echo ""
     echo "     experimental configure options (use at your own risk!!):"
@@ -225,7 +221,7 @@ while [ $# -ge 1 ] ; do
         -instprefix)        installPrefix=$2;                          shift 2;;
         -instprefix3)       installPrefixThird=$2;                     shift 2;;
         -doc)               docgeneration=ON;                          shift 1;;
-        -cvs)               sourcesFrom=CVS; cvsUserName=$2;           shift 2;;
+        -git)               sourcesFrom=GIT;                           shift 1;;
         -gdcm2)             gdcmVersion=GDCM2;                         shift 1;;
         -itk4)              ITKVersion=ITK4;                           shift 1;;
         -build)             buildType=$2;                              shift 2;;
@@ -289,7 +285,7 @@ fi
 if [ `checkVal $command config all` == true ] ; then
     echo "#!/bin/bash"                            >  $configureFile
     echo                                          >> $configureFile
-    echo "#File generated by 'menu.sh'"           >> $configureFile
+    echo "#File generated by 'installscript'"           >> $configureFile
     echo "#DO NOT edit !"                         >> $configureFile
     echo "#(except if you *do* know what you do)" >> $configureFile
     echo                                          >> $configureFile
@@ -300,7 +296,6 @@ if [ `checkVal $command config all` == true ] ; then
     echo "installPrefixThird=$installPrefixThird" >> $configureFile
     echo "docgeneration=$docgeneration"           >> $configureFile
     echo "sourcesFrom=$sourcesFrom"               >> $configureFile
-    echo "cvsUserName=$cvsUserName"               >> $configureFile 
     echo "loginUserName=$loginUserName"           >> $configureFile
     echo "loginGroupName=$loginGroupName"         >> $configureFile
     echo "buildType=$buildType"                   >> $configureFile
@@ -338,11 +333,12 @@ if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     else 
         # must log as root
         echo "Please enter the root passwd to add necessary packages:"; 
-        su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"   
+        sudo 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"