From f5a386701a8c4165a9c416be0904f2b5c86506b2 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 17 Feb 2011 10:20:20 +0000 Subject: [PATCH] export ETC_BASH --- Linux/menu.sh | 10 ++-------- Linux/scripts/CreaTools-install.sh | 10 ++-------- Linux/scripts/CreaTools-uninstall.sh | 10 ++-------- Linux/scripts/ThirdParty-install.sh | 13 ++----------- 4 files changed, 8 insertions(+), 35 deletions(-) diff --git a/Linux/menu.sh b/Linux/menu.sh index b902fed..dad1a5c 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -63,15 +63,9 @@ do 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" + export ETC_BASHRC="/etc/bash.bashrc" else - echo export ETC_BASHRC="/etc/bashrc" + export ETC_BASHRC="/etc/bashrc" fi echo "the curently used Third Party libraries are NOT in $installPrefixThird but in :" diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index a0ab5a4..708058f 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -31,15 +31,9 @@ then 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" + export ETC_BASHRC="/etc/bash.bashrc" else - echo export ETC_BASHRC="/etc/bashrc" + export ETC_BASHRC="/etc/bashrc" fi # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' if any diff --git a/Linux/scripts/CreaTools-uninstall.sh b/Linux/scripts/CreaTools-uninstall.sh index e174801..6ff52a0 100644 --- a/Linux/scripts/CreaTools-uninstall.sh +++ b/Linux/scripts/CreaTools-uninstall.sh @@ -78,15 +78,9 @@ rm -rf creaMaracasVisu if [ ! -f /etc/bashrc ] then - echo - echo "You are probabely running under UBUNTU OS ?" - echo "Troubles expected!" - echo - echo "Hit any key to continue"scripts/CreaTools-uninstall.sh - read a - echo export ETC_BASHRC="/etc/bash.bashrc" + export ETC_BASHRC="/etc/bash.bashrc" else - echo export ETC_BASHRC="/etc/bashrc" + export ETC_BASHRC="/etc/bashrc" fi # revert /etc/bashrc to previous value diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh index d0c75d7..329f43d 100644 --- a/Linux/scripts/ThirdParty-install.sh +++ b/Linux/scripts/ThirdParty-install.sh @@ -245,15 +245,9 @@ echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR >> $installPrefixThir if [ ! -f /etc/bashrc ] then - echo - echo "You are probabely running under UBUNTU OS ?" - echo "Troubles expected!" - echo - echo "Hit any key to continue"scripts/CreaTools-uninstall.sh - read a - echo export ETC_BASHRC="/etc/bash.bashrc" + export ETC_BASHRC="/etc/bash.bashrc" else - echo export ETC_BASHRC="/etc/bashrc" + export ETC_BASHRC="/etc/bashrc" fi sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC @@ -262,6 +256,3 @@ fi # - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???) echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] && source $installPrefixThird/share/creatools_third_party_library_config.sh' >> $ETC_BASHRC - - - -- 2.45.1