From 465967d52bb01f86cd28c1f4bde294a4b32d6ce6 Mon Sep 17 00:00:00 2001 From: clime Date: Mon, 11 Mar 2019 15:51:49 +0100 Subject: [PATCH] fix post-receive hook to account for empty post-receive-chained.d --- beaker-tests/tests/basic-test/run.sh | 2 +- scripts/dist-git/hooks/post-receive | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/beaker-tests/tests/basic-test/run.sh b/beaker-tests/tests/basic-test/run.sh index c3976d1..7858ac9 100755 --- a/beaker-tests/tests/basic-test/run.sh +++ b/beaker-tests/tests/basic-test/run.sh @@ -76,7 +76,7 @@ rlJournalStart modified_prev=`jq '.["/rpms/prunerepo.git"].modified' manifest.js.prev` modified=`jq '.["/rpms/prunerepo.git"].modified' manifest.js` - rlAssertGreater "Check that 'modifed' timestamp has been updated in the manifest file" $modified $modified_prev + rlAssertGreater "Check that 'modified' timestamp has been updated in the manifest file" $modified $modified_prev cd $CWD rlPhaseEnd diff --git a/scripts/dist-git/hooks/post-receive b/scripts/dist-git/hooks/post-receive index c049241..381087f 100755 --- a/scripts/dist-git/hooks/post-receive +++ b/scripts/dist-git/hooks/post-receive @@ -1,4 +1,9 @@ #!/bin/bash +dirpath="$GIT_DIR/hooks/post-receive-chained.d" +files=( "$dirpath"/* ) + # pee redirects stdin to each of the post-receive hooks in place. -/usr/bin/pee $GIT_DIR/hooks/post-receive-chained.d/* +if [[ -e "$files" || -L "$files" ]]; then + /usr/bin/pee "$dirpath"/* +fi