Skip to content

Commit fd9977b

Browse files
committed
#147: Allow server cleaner to remove databases with hyphens in name
1 parent 4ab7213 commit fd9977b

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

cmf/all/.cikit/ci/server-cleaner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
shell: |-
2828
COMMAND="mysql -u{{ mysql.user }} -p{{ mysql.pass }} -se"
2929
30-
${COMMAND} "SHOW DATABASES" | grep "{{ build_slug }}" | xargs -I "@@" ${COMMAND} "DROP DATABASE @@"
30+
${COMMAND} "SHOW DATABASES" | grep "{{ build_slug }}" | xargs -I "@@" ${COMMAND} "DROP DATABASE \`@@\`"
3131
rm -rf {{ webroot }}/*{{ build_slug }}*
3232
args:
3333
warn: no

scripts/roles/cikit-ci/files/tasks.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ cikit_hook() {
8686

8787
if [ -f "$HOOK_PLAYBOOK" ]; then
8888
cikit_run "$HOOK_PLAYBOOK" --dist="$DESTINATION" --rc="$PROCESS_EXIT_CODE"
89+
else
90+
echo "==> There's no \"$HOOK_PLAYBOOK\" hook to run."
8991
fi
9092
}
9193

0 commit comments

Comments
 (0)