v6.22

General | Resolved an issue where /etc/bashrc.d entries could be run multiple times: https://github.com/Fourdee/DietPi/issues/2529
MichaIng · Feb 10, 2019 · 3922a73 · 3922a73
1 parent 87faca8
commit 3922a73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -5,6 +5,7 @@ v6.22
 Changes / Improvements / Optimisations:
 
 Bug Fixes:
+- General | Resolved an issue where /etc/bashrc.d entries could be run multiple times: https://github.com/Fourdee/DietPi/issues/2529
 
 As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/Fourdee/DietPi/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aclosed+base%3Amaster
 

diff --git a/dietpi/patch_file b/dietpi/patch_file
@@ -1647,7 +1647,9 @@ Also have a look at "Sonarr", another alternative TV show manager, available for
  elif (( $G_DIETPI_VERSION_SUB == 21 )); then
 
  #-------------------------------------------------------------------------------
- echo 0
+ #Redo our /etc/bash.bashrc entry, user confirmed 4 entries: https://github.com/Fourdee/DietPi/issues/2529
+ sed -i '\#for i in /etc/bashrc#d' /etc/bash.bashrc
+ G_CONFIG_INJECT '.*/etc/bashrc\.d/.*' 'for i in /etc/bashrc.d/*.sh; do [ -r "$i" ] && . $i; done' /etc/bash.bashrc
  #-------------------------------------------------------------------------------
 
  fi