no message

[creaToolsTools.git] / Linux / menu.sh

diff --git a/Linux/menu.sh b/Linux/menu.sh
index e82924c02be9456b8d1d9eaefec08ec8ff1e51a3..3a26fd5d55249aa41eb607761c722ffbea985233 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -16,15 +16,16 @@ do
    echo
    echo " Choose what you want to do :"
    echo  
-   echo " Configure :..........................0 "
-   echo " Install Third Party Libraries :......1 (as root)"
-   echo " Get the 'CreaTools' source files :...2 (CVS : as user!)" 
-   echo " Compile   the CreaTools :............3 "
-   echo " Install   the CreaTools :............4 (as root)"
-   echo " Uninstall the CreaTools :............5 (as root)"
+   echo " Configure :........................0 "
+   echo " Install Third Party Libraries :....1 (as root)"
+   echo " Get the 'CreaTools' source files :.2 (CVS : as user!)" 
+   echo " Compile   the CreaTools :..........3 "
+   echo " Install   the CreaTools :..........4 (as root)"
+   echo " Uninstall the CreaTools :..........5 (as root)"
    echo
-   echo " Show some Environment Variables .....8"
-   echo " Exit :...............................9"
+   echo " Help ..............................7 Help about this menu"   
+   echo " Show some Environment Variables ...8"
+   echo " Exit :.............................9"
   echo
   echo
   echo 
@@ -81,10 +82,6 @@ do
 #  if [ "$suitable" = "NO" || "$suitable" = "N"  || "$suitable" = "no" || "$suitable" = "n" ]
  if [ "$suitable" = "NO" ]
   then
-  
-  
-
-       
        
      echo
      echo
@@ -99,7 +96,7 @@ do
 
                 "$OperatingSystem" != "MacOS" ]]
         do
-           echo "Operating System : Fedora/Ubuntu/MacOS (default :Fedora!)"
+           echo "Operating System : Fedora/Ubuntu/MacOS (default : Fedora)"
            read OperatingSystem
            if [ "$OperatingSystem" = "" ]
            then
@@ -148,13 +145,13 @@ do
         # ------------------
 
         docgeneration="___"
-        while [[ "$docgeneration" != "YES"  && "$docgeneration" != "NO" ]]
+        while [[ "$docgeneration" != "ON"  && "$docgeneration" != "OFF" ]]
         do
-           echo "Boolean For Doc Generation : YES/NO (default is NO)"
+           echo "Boolean For Doc Generation : ON/OFF (default is OFF)"
            read docgeneration
           if [ "$docgeneration" = "" ]
           then
-             docgeneration="NO"
+             docgeneration="OFF"
           fi
           echo "you said : [" $docgeneration "]"
         done
@@ -220,7 +217,7 @@ do
         # ------------------
 
         buildType="___"
-        while [[ "$buildType" != "Release"  && "$Debug " != "HTML" ]]
+        while [[ "$buildType" != "Release"  && "$buildType " != "Debug" ]]
         do
            echo "Build type : Release/Debug (default is Release)"
            read buildType
@@ -258,7 +255,7 @@ do
         echo "  Where do you want to get source files from : $sourcesFrom"
         if [ $sourcesFrom = CVS ]
         then
-           echo " CVS User Name                              : $cvsUserName"
+           echo "  CVS User Name                              : $cvsUserName"
         fi
         echo "  Login User Name                            : $loginUserName"
         echo "  Login Group Name                           : $loginGroupName"
@@ -369,15 +366,16 @@ do
         echo OK
         echo "To go on, run again 'sh menu.sh' as '$loginUserName', in a new window"
         echo "---------------------------------------------------------------------"
-        exit 0
      else
         echo "----------------------------------------------------------------------"
         echo OK
         echo "To go on, run again 'sh menu.sh'  in a new window"
         echo "---------------------------------------------------------------------"
-        exit 0    
-     fi 
-       
+     fi
+     echo
+     echo "==> Hit any key to exit close current window" 
+     read a
+     kill $PPID    
   ;;
 
   2)
@@ -416,7 +414,11 @@ do
          exit 0
       fi
       echo "========================= 4"
-      sh scripts/CreaTools-install.sh     
+      sh scripts/CreaTools-install.sh 
+     echo
+     echo "==> Hit any key to close current window" 
+     read a
+     kill $PPID        
   ;;
  
   5)
@@ -424,9 +426,17 @@ do
      sh scripts/CreaTools-uninstall.sh
   ;;
 
+  7)
+     clear
+     echo "==================================="
+     more README.txt
+      echo
+     echo "==> Hit any key to go on" 
+     read a
+  ;;
+         
   8)
      clear
-  
      echo "==================================="
      
      # WARNING : $installPrefixThird is taken from CreaTools-configure.sh