X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fmenu.sh;h=9bb34880444f2458c34da72a93e76e5b48191675;hb=c3880aa13b9e844cae1f1b6a3d4accf220e18e8b;hp=725901d8527d435bc092b083e40a4feed075d7d8;hpb=d41e4c024be4d3a4500f537b8a2d144e4341e3b2;p=creaToolsTools.git

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 725901d..9bb3488 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -23,11 +23,12 @@ do
    echo " Install   the CreaTools :..........4 (as root)"
    echo " Uninstall the CreaTools :..........5 (as root)"
    echo
+   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
@@ -40,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 "------------------------"
@@ -50,16 +55,29 @@ 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
-              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)"
+	      if [ ! -f /etc/bashrc ]
+	      then
+	         echo
+	         echo "You are probabely running under UBUNTU OS  ?"
+		 echo "Troubles expected!"
+		 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
         fi
 	echo	
         echo "Are these values suitable for you : YES/NO? (default is YES)"
@@ -73,33 +91,27 @@ 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!)"
+           echo "Operating System : Fedora/Ubuntu/MacOS (default : Fedora)"
            read OperatingSystem
            if [ "$OperatingSystem" = "" ]
            then
@@ -148,13 +160,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 +232,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 +270,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"
@@ -283,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
@@ -310,7 +322,7 @@ do
   1)
      echo "========================== 1 "
      source scripts/Check-if-root.sh
-     sh scripts/ThirdParty-install.sh
+     bash scripts/ThirdParty-install.sh
      
 #      vtkdirVariable=""
 #      while [ "$vtkdirVariable" = "" ]
@@ -367,30 +379,31 @@ do
      then
         echo "----------------------------------------------------------------------"
         echo OK
-        echo "To go on, run again 'sh menu.sh' as '$loginUserName', in a new window"
+        echo "To go on, run again 'bash 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 "To go on, run again 'bash 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)
     
      
      echo "========================== 2" 
-     sh scripts/CreaTools-load.sh
+     bash scripts/CreaTools-load.sh
   ;;
   
   3)
      echo "========================== 3"
      source scripts/CreaTools-configure.sh
-     sh scripts/CreaTools-compile.sh
+     bash scripts/CreaTools-compile.sh
      
      # To allow (*very* aware) user to patch code, later
   
@@ -416,17 +429,29 @@ do
          exit 0
       fi
       echo "========================= 4"
-      sh scripts/CreaTools-install.sh     
+      bash scripts/CreaTools-install.sh 
+     echo
+     echo "==> Hit any key to close current window" 
+     read a
+     kill $PPID        
   ;;
  
   5)
      echo "========================= 5"
-     sh scripts/CreaTools-uninstall.sh
+     bash 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