X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fmenu.sh;h=a965358a6cd4af655677bb7b6cd653db7b8548f0;hb=a0b3560b65656c6c2601dced3aeddebd66c0ea6d;hp=3a26fd5d55249aa41eb607761c722ffbea985233;hpb=4515e33035d05fc3d2faec342ff9083087dfd822;p=creaToolsTools.git

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 3a26fd5..a965358 100644
--- 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,32 @@ 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 +94,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)"
@@ -217,7 +234,7 @@ do
         # ------------------
 
         buildType="___"
-        while [[ "$buildType" != "Release"  && "$buildType " != "Debug" ]]
+        while [[ "$buildType" != "Release"  && "$buildType" != "Debug" ]]
         do
            echo "Build type : Release/Debug (default is Release)"
            read buildType
@@ -280,7 +297,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
@@ -307,7 +324,7 @@ do
   1)
      echo "========================== 1 "
      source scripts/Check-if-root.sh
-     sh scripts/ThirdParty-install.sh
+     bash scripts/ThirdParty-install.sh
      
 #      vtkdirVariable=""
 #      while [ "$vtkdirVariable" = "" ]
@@ -355,21 +372,21 @@ 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
         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 "---------------------------------------------------------------------"
      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 "---------------------------------------------------------------------"
      fi
      echo
@@ -382,13 +399,13 @@ do
     
      
      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
   
@@ -414,7 +431,7 @@ 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
@@ -423,7 +440,7 @@ do
  
   5)
      echo "========================= 5"
-     sh scripts/CreaTools-uninstall.sh
+     bash scripts/CreaTools-uninstall.sh
   ;;
 
   7)