#147: Allow server cleaner to remove databases with hyphens in name

BR0kEN- · Sep 11, 2018 · 5d4a088 · 5d4a088
1 parent 0e6ea03
commit 5d4a088
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cmf/all/.cikit/ci/server-cleaner.yml b/cmf/all/.cikit/ci/server-cleaner.yml
@@ -27,7 +27,7 @@
       shell: |-
         COMMAND="mysql -u{{ mysql.user }} -p{{ mysql.pass }} -se"
 
-        ${COMMAND} "SHOW DATABASES" | grep "{{ build_slug }}" | xargs -I "@@" ${COMMAND} "DROP DATABASE @@"
+        ${COMMAND} "SHOW DATABASES" | grep "{{ build_slug }}" | xargs -I "@@" ${COMMAND} "DROP DATABASE \`@@\`"
         rm -rf {{ webroot }}/*{{ build_slug }}*
       args:
         warn: no

diff --git a/scripts/roles/cikit-ci/files/tasks.sh b/scripts/roles/cikit-ci/files/tasks.sh
@@ -86,6 +86,8 @@ cikit_hook() {
 
   if [ -f "$HOOK_PLAYBOOK" ]; then
     cikit_run "$HOOK_PLAYBOOK" --dist="$DESTINATION" --rc="$PROCESS_EXIT_CODE"
+  else
+    echo "==> There's no \"$HOOK_PLAYBOOK\" hook to run."
   fi
 }