#3458 bashrc conflict linux 40 41

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index f6059857d1a5cd9e344efd7f5a8e289ba5ffa421..7bed640ee7719332c27c10c828d45d98e3274c96 100644 (file)
--- 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 815bba795e5b734c49790cf0e1d98317b71fb51d..723a0f25ca5a19e88c5d1e23e171750aa4e2ca59 100644 (file)
--- 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 7ac39b9d2fc14296266f314dae74212b14313c98..25c8ddf1a3454d1bcf857766d18e8b3817ec9807 100644 (file)
--- 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 c789a97b138f4bb037e0bd04eb57758d7eb967c9..371f475887566c973de1aebf5bdc27c7a4966735 100644 (file)
--- 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