upgrade (new) new way for Linux

diff --git a/Linux/README.txt b/Linux/README.txt
index 194f2f966680979b5e3396ae387900129a306b9d..0e6e39c9812a732e883c737ad7ac79adc77601a6 100644 (file)
--- a/Linux/README.txt
+++ b/Linux/README.txt
@@ -12,11 +12,11 @@ You will be prompted to say what you want to do :
 
 3) Choose 'Configure' (0)
 
-You will be prompted to give yiur preferences :
+You will be prompted to give your preferences :
 
 "Operating System : Fedora/Ubuntu/MacOS (mandatory!)"
 "Name of the Generation Directory (default is /tmp/myGenerationDir)"
-"Boolean For Doc Generation : YES/NO (default is NO)"
+"Boolean for Doc Generation : YES/NO (default is NO)"
 "Where do you want to get source files from : CVS/HTML (default is HTML)"
 -> if you choosed CVS 
 "CVS User Name (mandatory!)"

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 27918154ebdd5e3f047df6f9bc6d1e1d57a06016..be48f296dbf6ff8a77b7b4568e019e485d58f869 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -67,7 +67,8 @@ echo
   then
      generationdir="/tmp/myGenerationDir"
   fi
-  echo "you said : [" $generationdir "]"
+  echo "you said : [" $generationdir "]"su
+  
 echo
 echo
   # ------------------
@@ -124,7 +125,7 @@ echo
   done
   echo "you said : [" $cvsUserName "]"
   else
-    cvsUserName="cvsUserNameCannotBeEmpty" 
+    cvsUserName="ForgetThisOne" 
   fi
 echo
 echo
@@ -199,25 +200,64 @@ done
 
 configureFile="scripts/CreaTools-configure.sh"
 touch  $configureFile
-echo "#!/bin/sh"                         >> $configureFile
-echo "OperatingSystem=$OperatingSystem"  >> $configureFile
-echo "generationdir=$generationdir"      >> $configureFile
-echo "installPrefix=$installPrefix"      >> $configureFile
-echo "docgeneration=$docgeneration"      >> $configureFile
-echo "sourcesFrom=$sourcesFrom"          >> $configureFile
-echo "cvsUserName=$cvsUserName"          >> $configureFile 
-echo "linuxUserName=$linuxUserName"      >> $configureFile
-echo "buildType=$buildType"              >> $configureFile
-echo "gdcmVersion=$gdcmVersion"          >> $configureFile
+echo "#!/bin/sh"                          >  $configureFile
+echo                                      >> $configureFile
+echo "#File generated by 'menu.sh'"       >> $configureFile
+echo "#DO NOT edit !"                     >> $configureFile
+echo "#(except if you *know* what you do)">> $configureFile
+echo                                      >> $configureFile
+echo "OperatingSystem=$OperatingSystem"   >> $configureFile
+echo "generationdir=$generationdir"       >> $configureFile
+echo "installPrefix=$installPrefix"       >> $configureFile
+echo "docgeneration=$docgeneration"       >> $configureFile
+echo "sourcesFrom=$sourcesFrom"           >> $configureFile
+echo "cvsUserName=$cvsUserName"           >> $configureFile 
+echo "linuxUserName=$linuxUserName"       >> $configureFile
+echo "buildType=$buildType"               >> $configureFile
+echo "gdcmVersion=$gdcmVersion"           >> $configureFile
 
          
-  # ------------------
-         
+  # ------------------      
   ;;
   
   1)
      echo "========================== $i "
      sh scripts/ThirdParty-install.sh
+     
+     vtkdirVariable=""
+     while [ "$vtkdirVariable" = "" ]
+     do
+        echo " Set VTK_DIR environment variable"
+        read vtkdirVariable
+     done
+     echo "you said [" $vtkdirVariable "]"
+
+     #vtkdirVariable=""
+     #while [ "$vtkdirVariable" = "" ]
+     #do
+     #   echo " Set VTK_DIR environment variable"
+      #  read vtkdirVariable
+     #done
+     #echo "you said [" $vtkdirVariable "]"
+          
+     latexCompilerVariable=""
+     while [ "$latexCompilerVariable" = "" ]
+     do
+        echo " Set LATEX_COMPILER environment variable"
+        read latexCompilerVariable
+     done
+     echo "you said [" $latexCompilerVariable "]"     
+
+     sed -i -e '/.*VTK_DIR*/ d'        /etc/bashrc
+     sed -i -e '/.*LATEX_COMPILER*/ d' /etc/bashrc 
+     echo "export VTK_DIR=$vtkdirVariable" >> /etc/bashrc
+     echo "export LATEX_COMPILER=$latexCompilerVariable" >> /etc/bashrc
+     
+     echo "------------------------------------"
+     echo OK
+     echo "To go on, run again 'sh menu.sh' as root, in a new window"
+     echo "------------------------------------"
+     exit 0             
   ;;
   
   2)