Bug #1928 Removed the gitusername from the Linux installation scripts.

diff --git a/Linux/installscript b/Linux/installscript
index 338a200e68313cdd003c28116d0b366bc21becb4..c65468e096a536de700c59c0c3497714ba6d2bb8 100755 (executable)
--- 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 = GIT ] ; then
-    echo "  GIT User Name                              : $gitUserName"
-    fi
     echo "  Login User Name                            : $loginUserName"
     echo "  Login Group Name                           : $loginGroupName"
     echo "  Build type                                 : $buildType"          
@@ -152,7 +149,6 @@ installPrefix=
 docgeneration=OFF
 sourcesFrom=HTML
 
-gitUserName=
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=RelWithDebug
@@ -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 "        -git <gitusername>    : get creatools from git (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;;
-        -git)               sourcesFrom=GIT; gitUserName=$2;           shift 2;;
+        -git)               sourcesFrom=GIT;                           shift 1;;
         -gdcm2)             gdcmVersion=GDCM2;                         shift 1;;
         -itk4)              ITKVersion=ITK4;                           shift 1;;
         -build)             buildType=$2;                              shift 2;;
@@ -300,7 +296,6 @@ if [ `checkVal $command config all` == true ] ; then
     echo "installPrefixThird=$installPrefixThird" >> $configureFile
     echo "docgeneration=$docgeneration"           >> $configureFile
     echo "sourcesFrom=$sourcesFrom"               >> $configureFile
-    echo "gitUserName=$gitUserName"               >> $configureFile 
     echo "loginUserName=$loginUserName"           >> $configureFile
     echo "loginGroupName=$loginGroupName"         >> $configureFile
     echo "buildType=$buildType"                   >> $configureFile

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index cff47e6da6c5f47a1454817ef67845e3c031e161..1fa4c9db8866f6d65fbcf9893c1f095678ddd6cb 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -106,17 +106,17 @@ then
 #
       if [ $sourcesFrom = GIT ]
       then
-         bash $scriptDir/gitclone.sh $creasource                   $generationdir $gitUserName
-         bash $scriptDir/gitclone.sh $bbtksource                   $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creamaracassource            $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creabrukersource             $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creaimagesource              $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creacontourssource           $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $crearigidregistrationssource $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $bbtkgeditorsource            $generationdir $gitUserName 
-         bash $scriptDir/gitclone.sh $creatoolssource              $generationdir $gitUserName
-         bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir $gitUserName
+         bash $scriptDir/gitclone.sh $creasource                   $generationdir
+         bash $scriptDir/gitclone.sh $bbtksource                   $generationdir 
+         bash $scriptDir/gitclone.sh $creamaracassource            $generationdir 
+         bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir 
+         bash $scriptDir/gitclone.sh $creabrukersource             $generationdir 
+         bash $scriptDir/gitclone.sh $creaimagesource              $generationdir 
+         bash $scriptDir/gitclone.sh $creacontourssource           $generationdir 
+         bash $scriptDir/gitclone.sh $crearigidregistrationssource $generationdir 
+         bash $scriptDir/gitclone.sh $bbtkgeditorsource            $generationdir 
+         bash $scriptDir/gitclone.sh $creatoolssource              $generationdir
+         bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir
  #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF            $generationdir $cvsUserName
  #            mv $libidosource-ESRF $libidosource               
       fi

diff --git a/Linux/scripts/gitclone.sh b/Linux/scripts/gitclone.sh
index a1d2f354868f5ce047f6fa470015119eaeefbb6e..064c187c1dab1b416326a332354b6b88c0c7e857 100644 (file)
--- a/Linux/scripts/gitclone.sh
+++ b/Linux/scripts/gitclone.sh
@@ -1,6 +1,5 @@
 #$1 creasource                   
 #$2 generationdir 
-#$3 gitUserName
 
    
 cd $2/creatools_source