From cf34d65a3d3ee5523c4db5c15695319bb6076143 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Tue, 3 Dec 2024 10:51:32 +0100 Subject: [PATCH] #3458 bashrc conflict linux 40 41 --- Linux/scripts/CreaTools-install.sh | 8 ++++---- Linux/scripts/CreaTools-uninstall.sh | 4 ++-- Linux/scripts/TPLaux-bashrc.sh | 2 +- Linux/scripts/ThirdParty-bashrc.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index f605985..7bed640 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -101,10 +101,10 @@ if [ $OperatingSystem = "MacOS" ] then - echo 'source ~/.bashrc' > $generationdir/bbEditor.command - echo 'source ~/.bashrc' > $generationdir/bbi.command - echo 'source ~/.bashrc' > $generationdir/creaContourApp.command - echo 'source ~/.bashrc' > $generationdir/creaDevManager.command + echo 'source ~/.bashrc_CreaTools' > $generationdir/bbEditor.command + echo 'source ~/.bashrc_CreaTools' > $generationdir/bbi.command + echo 'source ~/.bashrc_CreaTools' > $generationdir/creaContourApp.command + echo 'source ~/.bashrc_CreaTools' > $generationdir/creaDevManager.command echo bbEditor >> $generationdir/bbEditor.command echo bbi >> $generationdir/bbi.command diff --git a/Linux/scripts/CreaTools-uninstall.sh b/Linux/scripts/CreaTools-uninstall.sh index 815bba7..723a0f2 100644 --- a/Linux/scripts/CreaTools-uninstall.sh +++ b/Linux/scripts/CreaTools-uninstall.sh @@ -113,8 +113,8 @@ echo "rm lib's" # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' #sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC -echo "revert $HOME/.bashrc to previous value" -sed -i -e '/.*creatools_base_library_config.*/ d' $HOME/.bashrc +echo "revert $HOME/.bashrc_CreaTools to previous value" +sed -i -e '/.*creatools_base_library_config.*/ d' $HOME/.bashrc_CreaTools #else # echo diff --git a/Linux/scripts/TPLaux-bashrc.sh b/Linux/scripts/TPLaux-bashrc.sh index 7ac39b9..25c8ddf 100644 --- a/Linux/scripts/TPLaux-bashrc.sh +++ b/Linux/scripts/TPLaux-bashrc.sh @@ -28,7 +28,7 @@ echo "---TPLaux-bashrc.sh---" echo $ETC_BASHRC echo "installPrefixTPLaux: " $installPrefixTPLaux -# Cleanning line in .bashrc file +# Cleanning line in .bashrc_CreaTools file sed -i -e '/.*installPrefixTPLaux*/ d' $ETC_BASHRC sed -i -e '/.*creatools_TPLaux_config.*/ d' $ETC_BASHRC diff --git a/Linux/scripts/ThirdParty-bashrc.sh b/Linux/scripts/ThirdParty-bashrc.sh index c789a97..371f475 100644 --- a/Linux/scripts/ThirdParty-bashrc.sh +++ b/Linux/scripts/ThirdParty-bashrc.sh @@ -28,7 +28,7 @@ echo "---ThirdParty-bashrc.sh---" echo $ETC_BASHRC echo $installPrefixThird -# Cleanning line in .bashrc file +# Cleanning line in .bashrc_CreaTools file sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC -- 2.47.1