From f5f19ab8b0a4c7e96eb26c09d0ee1417c06ceada Mon Sep 17 00:00:00 2001 From: Brandon Delcamp Date: Tue, 13 Oct 2020 13:22:44 -0400 Subject: [PATCH] Fix entrypoint.sh creating one folder named {plugins,embedded-db} Summary: To allow spaces in variables like OPENFIRE_DATA_DIR, they have been enclosed in quotes. As the expression uses GNU coreutils mkdir {} syntax, put the {} in quotes has broken the directory creation: instead to create /path/to/openfire/plugins and /path/to/openfire/embedded-db, it created the exact quoted content. That breaks new installations when directories don't exist. This change fixes that regression. This is a follow-up for e76b3cfd9f47. Test Plan: ``` $ export OPENFIRE_DATA_DIR=/tmp/openfire $ mkdir -p "${OPENFIRE_DATA_DIR}"/{plugins,embedded-db} $ ls $OPENFIRE_DATA_DIR embedded-db plugins ``` Reviewers: dereckson Reviewed By: dereckson Differential Revision: https://devcentral.nasqueron.org/D2372 --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 67ed7b5..777b25f 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -31,7 +31,7 @@ initialize_data_dir() { if [[ ! -d "${OPENFIRE_DATA_DIR}/conf" ]]; then sudo -HEu "${OPENFIRE_USER}" cp -a /etc/openfire "${OPENFIRE_DATA_DIR}/conf" fi - sudo -HEu "${OPENFIRE_USER}" mkdir -p "${OPENFIRE_DATA_DIR}/{plugins,embedded-db}" + sudo -HEu "${OPENFIRE_USER}" mkdir -p "${OPENFIRE_DATA_DIR}"/{plugins,embedded-db} sudo -HEu "${OPENFIRE_USER}" rm -rf "${OPENFIRE_DATA_DIR}/plugins/admin" sudo -HEu "${OPENFIRE_USER}" ln -sf /usr/share/openfire/plugin-admin /var/lib/openfire/plugins/admin