From ab99980b520e6cb471700b31bbda087f2ae3744f Mon Sep 17 00:00:00 2001
From: James Bunton <jamesbunton@delx.net.au>
Date: Mon, 19 Nov 2018 23:45:04 +1100
Subject: [PATCH] bash: read all environment.d

---
 .bashrc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.bashrc b/.bashrc
index ef54a27..b38679a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -17,9 +17,8 @@ while read -r p; do
 done < <(find -L ~/bin -maxdepth 1 -type d 2> /dev/null)
 
 # Set EMAIL from the freedesktop environment.d
-if [ -r ~/.config/environment.d/10-email.conf ]; then
-    source ~/.config/environment.d/10-email.conf
-    export EMAIL
+if ls ~/.config/environment.d/*.conf &> /dev/null; then
+    eval "$(awk -F= '{print $0 ";export " $1}' ~/.config/environment.d/*.conf)"
 fi
 
 # Pick up SSH agent socket
@@ -71,7 +70,7 @@ export HISTTIMEFORMAT='%F %T '
 stty -ixon
 
 # hostname:workingdir
-PROMPT_COMMAND='echo -ne "\\033]0;$(hostname| cut -d. -f1):${PWD/$HOME/~}\\007"'
+PROMPT_COMMAND='echo -ne "\\033]0;$(hostname|cut -d. -f1):${PWD/$HOME/~}\\007"'
 
 
 #############
@@ -172,8 +171,7 @@ fi
 ##########################
 
 # GNU ls colours
-# shellcheck disable=SC2046
-eval $(TERM=xterm dircolors 2> /dev/null)
+eval "$(TERM=xterm dircolors 2> /dev/null)"
 
 # BSD ls colours
 export LSCOLORS="ExFxCxDxBxEGEDABAGACAD"
-- 
2.39.2