From c3880aa13b9e844cae1f1b6a3d4accf220e18e8b Mon Sep 17 00:00:00 2001
From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Mon, 14 Feb 2011 16:03:04 +0000
Subject: [PATCH] Check if /etc/bashrc exists...

---
 Linux/menu.sh                       | 47 +++++++++++++++++++----------
 Linux/scripts/ThirdParty-install.sh | 15 +++++++--
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 4ff3989..9bb3488 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,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)"
@@ -74,22 +91,20 @@ 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" && \
@@ -280,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
diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 36f8f12..369e5c8 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -242,8 +242,19 @@ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR   	>> $installPrefixThir
 
 #  modify .bashrc
 # - remove line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
-sed -i -e '/.*installPrefixThird*/ d' /etc/bashrc
-sed -i -e '/.*creatools_third_party_library_config.*/ d' /etc/bashrc
+
+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
+   sed -i -e '/.*installPrefixThird*/ d' /etc/bashrc
+   sed -i -e '/.*creatools_third_party_library_config.*/ d' /etc/bashrc
+fi
 
 # - add line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
 echo installPrefixThird=$installPrefixThird >> /etc/bashrc
-- 
2.45.1