From 71ec84349d0f21c605d16f5334e58b31b0eeee8e Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 27 Jul 2021 02:58:44 +0200
Subject: Merging upstream version 20210727.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 share/hooks/pre-get.git-pull.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'share/hooks/pre-get.git-pull.sh')

diff --git a/share/hooks/pre-get.git-pull.sh b/share/hooks/pre-get.git-pull.sh
index 744f955..d2cc152 100755
--- a/share/hooks/pre-get.git-pull.sh
+++ b/share/hooks/pre-get.git-pull.sh
@@ -31,10 +31,13 @@ do
 	then
 		echo "Updating ${DIRECTORY}..."
 
-		if [ -e "/etc/${SOFTWARE}.conf" ]
-		then
-			. "/etc/${SOFTWARE}.conf"
-		fi
+		for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf
+		do
+			if [ -e "${FILE}" ]
+			then
+				. "${FILE}"
+			fi
+		done
 
 		DEBCONF_ID="${DEBCONF_ID:-HEAD}"
 
-- 
cgit v1.2.3