From a1131f958ab85c6f2d2109d79cf41af0ce970f9e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 18 Feb 2018 15:21:44 +0100 Subject: Making pre-create.git-pull.sh hook to be aware of multiple subdirectories below /etc/container-tools/debconf for multi-site container debconf files. Signed-off-by: Daniel Baumann --- share/hooks/pre-create.git-pull.sh | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/share/hooks/pre-create.git-pull.sh b/share/hooks/pre-create.git-pull.sh index 39c115e..cee7d8c 100755 --- a/share/hooks/pre-create.git-pull.sh +++ b/share/hooks/pre-create.git-pull.sh @@ -20,23 +20,28 @@ set -e -if [ -e /etc/container-tools/debconf/.git ] && [ -e /usr/bin/git ] -then - echo "Updating /etc/container-tools/debconf..." +DIRECTORIES="/etc/container-tools/debconf /etc/container-tools/debconf/*/" - if [ -e /etc/default/container-tools ] +for DIRECTORY in ${DIRECTORIES} +do + if [ -e "${DIRECTORY}/.git" ] && [ -e /usr/bin/git ] then - . /etc/default/container-tools - fi + echo "Updating ${DIRECTORY}..." + + if [ -e /etc/default/container-tools ] + then + . /etc/default/container-tools + fi - DEBCONF_ID="${DEBCONF_ID:-HEAD}" + DEBCONF_ID="${DEBCONF_ID:-HEAD}" - cd /etc/container-tools/debconf + cd "${DIRECTORY}" - git clean -dfx - git checkout -f ${DEBCONF_ID} - git pull --rebase - echo + git clean -dfx + git checkout -f ${DEBCONF_ID} + git pull --rebase + echo - cd "${OLDPWD}" -fi + cd "${OLDPWD}" + fi +done -- cgit v1.2.3