From 3d2b2b4be8b6e275d0928acc65291473be4c8402 Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Mon, 18 Mar 2024 14:36:21 +0300 Subject: [PATCH] code rework --- profiles/default/profile.bashrc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/profiles/default/profile.bashrc b/profiles/default/profile.bashrc index 65ea259c1..ec334e946 100644 --- a/profiles/default/profile.bashrc +++ b/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