menu : use expanded / compact

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 486e887451f6a013803b6a402bef68cd08915221..18628b82668a1b43847e9950a61138f6f0e4c49a 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -5,6 +5,7 @@
      source scripts/CreaTools-configure.sh
   fi
 
+expanded="NO"
 i=999
 while [ "$i" != 9 ]
 do
@@ -16,14 +17,25 @@ do
    echo
    echo " Choose what you want to do :"
    echo  
-   echo " Configure :........................0 "
+   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 "
+   if [ $expanded = "YES" ]
+   then
+   echo " Get the 'CreaTools' source files :.2.1 (CVS : as user!)" 
+   echo " Compile   the CreaTools :..........2.2"
 # Install creatools as user (no longer as root) // JPR 2/5/2011   
-   echo " Install   the CreaTools :..........4 "
-   echo " Uninstall the CreaTools :..........5 "
+   echo " Install   the CreaTools :..........2.3"
+   else
+   echo " Get and Install the 'CreaTools':...2"
+   fi
    echo
+   if [ $expanded = "NO" ]
+   then
+   echo " Use Expanded menu :................5 "
+   else
+   echo " Use compact menu :.................5 "
+   fi      
+   echo " Uninstall the CreaTools :..........6 "
    echo " Help ..............................7 Help about this menu"   
    echo " Show some Environment Variables ...8"
    echo " Exit :.............................9"
@@ -73,9 +85,9 @@ do
               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 "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    
@@ -334,18 +346,31 @@ do
         echo "---------------------------------------------------------------------"
      fi
      echo
-     echo "==> Hit any key to exit close current window" 
+     echo "==> You HAVE to leave current window to continue!" 
      read a
      kill $PPID    
   ;;
 
   2)
-     echo "========================== 2" 
+     #2.1
+     bash scripts/CreaTools-load.sh
+     #2.2
+     source scripts/CreaTools-configure.sh
+     bash scripts/CreaTools-compile.sh
+     #2.3     
+     bash scripts/CreaTools-install.sh
+     echo "You HAVE to leave current window to continue!"
+     read a
+     kill $PPID        
+  ;;
+  
+  2.1)
+     echo "========================== 2.1" 
      bash scripts/CreaTools-load.sh
   ;;
 
-  3)
-     echo "========================== 3"
+  2.2)
+     echo "========================== 2.2"
      source scripts/CreaTools-configure.sh
      
      bash scripts/CreaTools-compile.sh
@@ -368,7 +393,7 @@ do
     fi    
   ;;
   
-  4)
+  2.3)
 
 #      if [ $UID != 0 ]
 #      then
@@ -387,22 +412,26 @@ do
       echo "========================= 4"
       
       bash scripts/CreaTools-install.sh
-      
    
 #      if [ $UID != 0 ]
 #      then
 #        echo "You HAVE to leave current window to continue!"
 #      else
 #        echo "==> Hit any key to close current window"
-#      fi
+#      fi 
+  ;;
 
 
-      echo "You HAVE to leave current window to continue!"
-      read a
-      kill $PPID     
-  ;;
- 
   5)
+   if [ $expanded = "NO" ]
+   then
+   expanded="YES"
+   else
+  expanded="NO"
+   fi
+  ;;
+   
+  6)
      echo "========================= 5"
      bash scripts/CreaTools-uninstall.sh 
      echo
@@ -434,9 +463,9 @@ do
         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 "VTK_DIR  : " $VTK_DIR
+        echo "ITK_DIR  : " $ITK_DIR
+        echo "GDCM_DIR : " $GDCM_DIR
        echo
        echo "installPrefixThird ... " $installPrefixThird
      fi
@@ -461,33 +490,43 @@ do
         echo "installPrefix ... " $installPrefix
      fi 
      echo  ------
-        echo "VTK_DIR :...." $VTK_DIR
-        echo "ITK_DIR :...." $ITK_DIR
-        echo "GDCM_DIR :..." $GDCM_DIR
-        echo "CREA_DIR :...................." $CREA_DIR
-        echo "BBTK_DIR :...................." $BBTK_DIR
-        echo "CREAMARACASVISU_DIR :........." $CREAMARACASVISU_DIR
-        echo "CREAENVIRONMENT_DIR :........." $CREAENVIRONMENT_DIR
-        echo "CREABRUKER_DIR :.............." $CREABRUKER_DIR
-        echo "CREAIMAGEIO_DIR :............." $CREAIMAGEIO_DIR
-        echo "CREACONTOUR_DIR :............." $CREACONTOUR_DIR
-        echo "CREARIGIDREGISTRATION_DIR :..." $CREAIGIDREGISTRATION_DIR
-        echo "CREABTKGEDITOR_DIR :.........." $CREABTKGEDITOR_DIR
-        echo "CREATOOLS_DIR :..............." $CREATOOLS_DIR   
+        echo "VTK_DIR  : " $VTK_DIR
+        echo "ITK_DIR  : " $ITK_DIR
+        echo "GDCM_DIR : " $GDCM_DIR
+        echo "crea_DIR :                 " $crea_DIR
+        echo "bbtk_DIR :                 " $bbtk_DIR
+        echo "creaMaracasVisu_DIR :      " $creaMaracasVisu_DIR
+        echo "creaEnvironment_DIR :      " $creaEnvironment_DIR
+        echo "creaBruker_DIR :           " $creaBruker_DIR
+        echo "creaImageIO_DIR :          " $creaImageIO_DIR
+        echo "creaContours_DIR :         " $creaContours_DIR
+        echo "creaRigidRegistration_DIR :" $creaRigidRegistration_DIR
+        echo "bbtkGEditor_DIR :          " $bbtkGEditor_DIR
+        echo "creaTools_DIR :            " $creaTools_DIR      
                                    
         echo "==================================="
         echo
         echo "Press any key to continue"
         read a
    ;;
-               
+
   9) 
-  echo 
-  exit 0
-  ;;
-   
+    echo 
+    exit 0
+    ;;
+
+  10) 
+    bash scripts/ThirdParty-install_no_compile.sh  
+    ;;
+      
   *)
-  echo "Your answer must be in {0, 1, 2, 3, 4, 5, 7, 8, 9} (was [ $i ])"
+  
+  if [ expanded="NO" ]
+  then
+     echo "Your answer must be in {0, 1, 2, 5, 6, 7, 8, 9} (was [ $i ])"
+  else
+     echo "Your answer must be in {0, 1, 2.1, 2.2, 2.3, 5, 6, 7, 8, 9} (was [ $i ])"
+  fi
   ;;
   esac