avoid touch + rm + touch

[creaToolsTools.git] / Linux / menu.sh

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 9bb34880444f2458c34da72a93e76e5b48191675..b902fedfad30faab2d169ce7ef48b617f615859a 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -43,7 +43,7 @@ do
      while [[ "$suitable" != "YES" && \
               "$suitable" != "yes" && \
               "$suitable" != "Y"   && \
-              "$suitable" != "y"   && \                    
+              "$suitable" != "y"   && \
               "$suitable" != "NO"  && \
               "$suitable" != "no"  ]]
      do          
@@ -55,9 +55,8 @@ do
        # WARNING : $installPrefixThird is taken from CreaTools-configure.sh
         # if user configured without installing third party library,
         # Last third party library is still in use!  JPR
-       
-       
-       
+
+
         if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
         then
               echo WARNING
@@ -66,18 +65,21 @@ do
              then
                 echo
                 echo "You are probabely running under UBUNTU OS  ?"
-                echo "Troubles expected!"
+                echo "Troubles expected! (Hope NO!)"
                 echo   
                 echo "Hit any key to continue"
                  read a
-              else 
-                 echo "the curently used Third Party libraries are NOT in $installPrefixThird but in :"
-                 grep "installPrefixThird=" /etc/bashrc 
-                 echo "VTK_DIR :...." $VTK_DIR
-                 echo "ITK_DIR :...." $ITK_DIR
-                 echo "GDCM_DIR :..." $GDCM_DIR
-                echo "(Have a look at /etc/bashrc, edit it or run again Install Third Party Libraries if you disagree)"
-              fi
+                echo export ETC_BASHRC="/etc/bash.bashrc"
+              else
+                 echo export ETC_BASHRC="/etc/bashrc"
+              fi             
+              echo "the curently used Third Party libraries are NOT in $installPrefixThird but in :"
+                
+              grep "installPrefixThird=" $ETC_BASHRC 
+              echo "VTK_DIR :...." $VTK_DIR
+              echo "ITK_DIR :...." $ITK_DIR
+              echo "GDCM_DIR :..." $GDCM_DIR
+             echo "(Have a look at $ETC_BASHRC=, edit it or run again Install Third Party Libraries if you disagree)"
         fi
        echo    
         echo "Are these values suitable for you : YES/NO? (default is YES)"
@@ -108,7 +110,6 @@ do
         OperatingSystem="XXX"
         while [[ "$OperatingSystem" != "Fedora" && \
                  "$OperatingSystem" != "Ubuntu" && \
-
                 "$OperatingSystem" != "MacOS" ]]
         do
            echo "Operating System : Fedora/Ubuntu/MacOS (default : Fedora)"
@@ -146,7 +147,6 @@ do
         echo 
         # ------------------
 
-
         installPrefix="___"
         echo "Install Prefix for CreaTools : '$generationdir/creatools_install' / '/usr/local' (default is '$generationdir/creatools_install')"
         read installPrefix
@@ -370,10 +370,10 @@ do
 #      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
+#     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
 
      if [ "$sourcesFrom" = "CVS" ]
      then