code rework

profiles/default/profile.bashrc

@@ -1,3 +1,4 @@
+
 # vim: set syntax=sh
 #
 # Copyright 2016 Calculate Ltd. http://www.calculate-linux.org
@@ -8,17 +9,16 @@
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 
-PROFILE_BASHRC_DIRS=(/etc/calculate/profile.bashrc.d /var/lib/calculate/profile.bashrc.d)
+PROFILE_BASHRC_DIRS=(
+	/etc/calculate/profile.bashrc.d
+	/var/lib/calculate/profile.bashrc.d
+)
 
-for PROFILE_BASHRC_FILE in $(( for dn in ${PROFILE_BASHRC_DIRS[@]};do ls -1 $dn 2>/dev/null;done ) | sort | uniq)
-do
-    for PROFILE_BASHRC_DN in ${PROFILE_BASHRC_DIRS[@]}
-    do
-        if [[ -f ${PROFILE_BASHRC_DN}/${PROFILE_BASHRC_FILE} ]]
-        then
-            source ${PROFILE_BASHRC_DN}/${PROFILE_BASHRC_FILE} && PROFILE_BASHRC_D=1
+for PROFILE_BASHRC_FILE in $((for dn in ${PROFILE_BASHRC_DIRS[@]}; do ls -1 $dn 2>/dev/null; done) | sort -u); do
+    for PROFILE_BASHRC_DN in ${PROFILE_BASHRC_DIRS[@]}; do
+        if [[ -f ${PROFILE_BASHRC_DN}/${PROFILE_BASHRC_FILE} ]]; then
+            source ${PROFILE_BASHRC_DN}/${PROFILE_BASHRC_FILE}
             break
         fi
     done
 done
-[[ -z ${PROFILE_BASHRC_D} ]] && source ${BASH_SOURCE}.old