Skip to content

Commit f5f19ab

Browse files
bdelcampdereckson
authored andcommitted
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 e76b3cf. 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
1 parent 57e7115 commit f5f19ab

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ initialize_data_dir() {
3131
if [[ ! -d "${OPENFIRE_DATA_DIR}/conf" ]]; then
3232
sudo -HEu "${OPENFIRE_USER}" cp -a /etc/openfire "${OPENFIRE_DATA_DIR}/conf"
3333
fi
34-
sudo -HEu "${OPENFIRE_USER}" mkdir -p "${OPENFIRE_DATA_DIR}/{plugins,embedded-db}"
34+
sudo -HEu "${OPENFIRE_USER}" mkdir -p "${OPENFIRE_DATA_DIR}"/{plugins,embedded-db}
3535
sudo -HEu "${OPENFIRE_USER}" rm -rf "${OPENFIRE_DATA_DIR}/plugins/admin"
3636
sudo -HEu "${OPENFIRE_USER}" ln -sf /usr/share/openfire/plugin-admin /var/lib/openfire/plugins/admin
3737

0 commit comments

Comments
 (0)