X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fmenu.sh;h=725901d8527d435bc092b083e40a4feed075d7d8;hb=d41e4c024be4d3a4500f537b8a2d144e4341e3b2;hp=4b5539bbdbba45f41ad7eacc3db513273c7c7e2a;hpb=33b96c45be5e651289e60def82b5e14d24cf276d;p=creaToolsTools.git

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 4b5539b..725901d 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -e
 
+  if [ -f scripts/CreaTools-configure.sh ]
+  then
+     source scripts/CreaTools-configure.sh
+  fi
 
 i=999
 while [ "$i" != 9 ]
@@ -12,14 +16,15 @@ 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 " Exit :...............................9"
+   echo " Show some Environment Variables ...8"
+   echo " Exit :.............................9"
   echo
   echo
   echo 
@@ -29,6 +34,7 @@ do
 
   case $i in
   0)
+  clear
   suitable=XXX
   #ls -l  scripts/CreaTools-configure.sh
   if [ -f scripts/CreaTools-configure.sh ]
@@ -40,7 +46,23 @@ do
         echo "------------------------"
         more scripts/CreaTools-configure.sh
         echo "------------------------"
-        echo "Are the following values suitable for you : YES/NO? (default is YES)"
+	
+	# 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)"
+        fi
+	echo	
+        echo "Are these values suitable for you : YES/NO? (default is YES)"
         read suitable
         if [ "$suitable" = "" ]
         then
@@ -244,6 +266,7 @@ do
         echo "  Gdcm version                               : $gdcmVersion"
         echo
         echo
+     
         echo "Do you confirm your choices : YES/NO ? (default is YES)"
         read confirm
 	if [ "$confirm" = "" ]
@@ -277,6 +300,7 @@ do
    echo "loginGroupName=$loginGroupName"         >> $configureFile
    echo "buildType=$buildType"                   >> $configureFile
    echo "gdcmVersion=$gdcmVersion"               >> $configureFile
+   
 
   # ------------------      
   # endif 'suitable'
@@ -390,18 +414,63 @@ do
          echo
          echo
          exit 0
-fi
-     echo "========================= 4"
-     sh scripts/CreaTools-install.sh     
+      fi
+      echo "========================= 4"
+      sh scripts/CreaTools-install.sh     
   ;;
  
   5)
      echo "========================= 5"
      sh scripts/CreaTools-uninstall.sh
   ;;
-       
+
+  8)
+     clear
+  
+     echo "==================================="
+     
+     # 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
+     fi
+	     
+     if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+     then
+        echo  $installPrefixThird/share/creatools_third_party_library_config.sh
+	echo  ------
+	more $installPrefixThird/share/creatools_third_party_library_config.sh
+	echo  ------
+     fi
+     
+     echo
+     
+     if [ -f $installPrefix/share/creatools_base_library_config.sh ]
+     then
+        echo  $installPrefix/share/creatools_base_library_config.sh
+	echo  ------ 
+	more $installPrefix/share/creatools_base_library_config.sh
+	echo  ------ 
+     fi   
+     echo "==================================="
+     echo
+     echo "Press any key to continue"
+     read a
+   ;;
+               
   9) 
-  echo exit
+  echo 
+  exit 0
   ;;
    
   *)