avoid touch + rm + touch

[creaToolsTools.git] / Linux / menu.sh

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 4ff39892034f943794644836436c98911dda06cd..b902fedfad30faab2d169ce7ef48b617f615859a 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -26,9 +26,9 @@ do
    echo " Help ..............................7 Help about this menu"   
    echo " Show some Environment Variables ...8"
    echo " Exit :.............................9"
-  echo
-  echo
-  echo 
+   echo
+   echo
+   echo 
 
   echo "Type in your choice :"
   read i
@@ -41,7 +41,11 @@ do
   if [ -f scripts/CreaTools-configure.sh ]
   then
      while [[ "$suitable" != "YES" && \
-              "$suitable" != "NO" ]]
+              "$suitable" != "yes" && \
+              "$suitable" != "Y"   && \
+              "$suitable" != "y"   && \
+              "$suitable" != "NO"  && \
+              "$suitable" != "no"  ]]
      do          
         echo "'Configure' already done : "
         echo "------------------------"
@@ -51,16 +55,31 @@ 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
               echo
+             if [ ! -f /etc/bashrc ]
+             then
+                echo
+                echo "You are probabely running under UBUNTU OS  ?"
+                echo "Troubles expected! (Hope NO!)"
+                echo   
+                echo "Hit any key to continue"
+                 read a
+                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 
+                
+              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)"
+             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)"
@@ -74,26 +93,23 @@ do
      suitable="NO"
   fi
   
-  if [ "$suitable" = "YES" ]
+  if [[ "$suitable" = "YES" || "$suitable" = "Y" || "$suitable" = "yes" || "$suitable" = "y" ]]
   then
      source scripts/CreaTools-configure.sh
   fi
   
-#  if [ "$suitable" = "NO" || "$suitable" = "N"  || "$suitable" = "no" || "$suitable" = "n" ]
- if [ "$suitable" = "NO" ]
+ if [[ "$suitable" = "NO" || "$suitable" = "N"  || "$suitable" = "no" || "$suitable" = "n" ]]
+ #if [ "$suitable" = "NO" ]
   then
-       
      echo
      echo
      confirm="NO"
      while [ "$confirm" != "YES" ]
      do
      
-     
         OperatingSystem="XXX"
         while [[ "$OperatingSystem" != "Fedora" && \
                  "$OperatingSystem" != "Ubuntu" && \
-
                 "$OperatingSystem" != "MacOS" ]]
         do
            echo "Operating System : Fedora/Ubuntu/MacOS (default : Fedora)"
@@ -131,7 +147,6 @@ do
         echo 
         # ------------------
 
-
         installPrefix="___"
         echo "Install Prefix for CreaTools : '$generationdir/creatools_install' / '/usr/local' (default is '$generationdir/creatools_install')"
         read installPrefix
@@ -280,7 +295,7 @@ do
 
    configureFile="scripts/CreaTools-configure.sh"
    touch  $configureFile
-   echo "#!/bin/sh"                              >  $configureFile
+   echo "#!/bin/bash"                            >  $configureFile
    echo                                          >> $configureFile
    echo "#File generated by 'menu.sh'"           >> $configureFile
    echo "#DO NOT edit !"                         >> $configureFile
@@ -355,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