X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FAll.sh;fp=Install%2Fscripts%2FAll.sh;h=944b7c2530131383c5b4af93e65ab449d6ba9596;hb=322ef7eb18cf1799493d3a27ce919a3904e6c207;hp=60b14ff91fe9269a06d0f473692b9b6d27177ad7;hpb=463649afb50d473f19d9ad9f9bdde85c002510f2;p=creaToolsTools.git

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index 60b14ff..944b7c2 100644
--- a/Install/scripts/All.sh
+++ b/Install/scripts/All.sh
@@ -37,13 +37,19 @@ fi
 #allow user to choose to generate the doc or not
 
 generationdir=$1
-docGeneration=$2
+docgeneration=$2
 cvsUserName=$3
 installPrefix=$4
 buildType=$5
 gdcmVersion=$6
 
 scriptDir=$PWD
+echo scriptDir
+echo $scriptDir
+
+
+mkdir $generationdir
+cd $generationdir
 
  creasource=crea
  bbtksource=bbtk
@@ -56,11 +62,6 @@ scriptDir=$PWD
  bbtkgeditorsource=bbtkGEditor
  creatoolssource=creaTools
 
-mkdir $generationdir
-mkdir $generationdir/creatools_source
-mkdir $generationdir/creatools_bin
- 
-cd $generationdir
 
 # start_point : used at debug time : start point of the script
 # ex : if everything is OK, but bbtkGEditor, 
@@ -72,31 +73,10 @@ start_point=0
 
 
 
-# ----------------------------------
-#         start_point =  0 : checkout all
-#-----------------------------------
-if [ $start_point -le 0 ]
-then
-#if [ true = false ]
-if [ true = true ]
-then
-  sh $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName
-  sh $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName
-fi
-fi
-
 # --------------------------------
-#         start_point = 1 : remove everything but source files
+#         start_point = 0 : remove everything but source files
 #---------------------------------
-if [ $start_point -le 1 ]
+if [ $start_point -le 0 ]
 then
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
@@ -370,11 +350,12 @@ sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatoo
 
 #  modify .bashrc
 # - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
+sed -i -e '/.*installPrefixCreaTools*/ d' ~/.bashrc
 sed -i -e '/.*creatools_base_library_config.*/ d' ~/.bashrc
 
 # - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
-#echo [ -f "$installPrefix/share/creatools_base_library_config.sh" ] &&  source $installPrefix/share/creatools_base_library_config.sh >> ~/.bashrc 
-echo source $installPrefix/share/creatools_base_library_config.sh >> ~/.bashrc 
+echo installPrefixCreaTools=$installPrefix >> ~/.bashrc
+echo '[ -f "$installPrefixCreaTools/share/creatools_base_library_config.sh" ] &&  source $installPrefixCreaTools/share/creatools_base_library_config.sh' >> ~/.bashrc 
 
 
 # shutdown /s