From 05abe3279dd77f37c98a79f508cd2ba9b66ff395 Mon Sep 17 00:00:00 2001
From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 20 Jan 2011 19:28:49 +0000
Subject: [PATCH] *** empty log message ***

---
 Linux/menu.sh                       | 40 ++++++++++++++---------------
 Linux/scripts/ThirdParty-install.sh | 18 +++----------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/Linux/menu.sh b/Linux/menu.sh
index a9c5949..83b7584 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -1,10 +1,10 @@
 #!/bin/bash -e
 
-clear
 
 i=999
 while [ "$i" != 9 ]
 do
+   clear
    echo
    echo
    echo
@@ -12,14 +12,14 @@ 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 " Exit :...............................9"
   echo
   echo
   echo 
@@ -213,20 +213,20 @@ do
         echo
         echo
         echo "You said :"
-        echo "           Operating System                           : $OperatingSystem"
-        echo "           Name of the Generation Directory           : $generationdir"
-        echo "           Install Prefix for Third Party Libraries   : $installPrefixThird"	
-        echo "           Install Prefix for CreaTools               : $installPrefix"
-        echo "           Boolean for Doc Generation                 : $docgeneration"
-        echo "           Where do you want to get source files from : $sourcesFrom"
+        echo "  Operating System                           : $OperatingSystem"
+        echo "  Name of the Generation Directory           : $generationdir"
+        echo "  Install Prefix for Third Party Libraries   : $installPrefixThird"	
+        echo "  Install Prefix for CreaTools               : $installPrefix"
+        echo "  Boolean for Doc Generation                 : $docgeneration"
+        echo "  Where do you want to get source files from : $sourcesFrom"
         if [ $sourcesFrom = CVS ]
         then
            echo "           CVS User Name                              : $cvsUserName"
         fi
-        echo "           Login User Name                            : $loginUserName"
-        echo "           Login Group Name                           : $loginGroupName"
-        echo "           Build type                                 : $buildType"          
-        echo "           Gdcm version                               : $gdcmVersion"
+        echo "  Login User Name                            : $loginUserName"
+        echo "  Login Group Name                           : $loginGroupName"
+        echo "  Build type                                 : $buildType"          
+        echo "  Gdcm version                               : $gdcmVersion"
         echo
         echo
         echo "Do you confirm your choices : YES/NO ? (default is NO)"
@@ -266,7 +266,7 @@ do
   
   1)
      echo "========================== 1 "
-     source scripts/Check-if-root.sh
+#EED_missing_this_file      source scripts/Check-if-root.sh
      
      sh scripts/ThirdParty-install.sh
      
@@ -277,8 +277,6 @@ do
         do
            echo
 	   echo " --------------------------------"
-	   
-	   X				
            echo " Set VTK_DIR environment variable"
 	   echo " --------------------------------"
            echo		
diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 651ca8d..836c0af 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -161,6 +161,7 @@ then
   cd ..
 fi
 
+
 if [ true = true ]
 then
   libname=gdcm
@@ -228,23 +229,12 @@ 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
 
 # - add line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
-echo source $installPrefixThird/share/creatools_third_party_library_config.sh >> /etc/bashrc 
-
-
-
+echo installPrefixThird=$installPrefix >> /etc/bashrc
+echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> /etc/bashrc 
 
 
 
-
-#  modify .bashrc
-# - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
-sed -i -e '/.*installPrefixCreaTools*/ d' ~/.bashrc
-sed -i -e '/.*creatools_base_library_config.*/ d' ~/.bashrc
-
-# - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
-echo installPrefixCreaTools=$installPrefix >> ~/.bashrc
-
-echo '[ -f "$installPrefixCreaTools/share/creatools_base_library_config.sh" ] &&  source $installPrefixCreaTools/share/creatools_base_library_config.sh' >> ~/.bashrc 
-- 
2.45.0