Skip to content

Commit

Permalink
fix(shulker-operator): add back fallbacks on init scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylvln committed Mar 25, 2024
1 parent 0937f95 commit b237790
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions packages/shulker-operator/assets/proxy-init-fs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ else
cp "${SHULKER_CONFIG_DIR}/bungeecord-config.yml" "${SHULKER_PROXY_DATA_DIR}/config.yml"
fi

if [ ! -z "${SHULKER_PROXY_PLUGIN_URLS}" ]; then
if [ ! -z "${SHULKER_PROXY_PLUGIN_URLS:-}" ]; then
mkdir -p "${SHULKER_PROXY_DATA_DIR}/plugins"
for plugin_url in ${SHULKER_PROXY_PLUGIN_URLS//;/ }; do
(cd "${SHULKER_PROXY_DATA_DIR}/plugins" && wget "${plugin_url}")
done
fi

if [ ! -z "${SHULKER_PROXY_PATCH_URLS}" ]; then
if [ ! -z "${SHULKER_PROXY_PATCH_URLS:-}" ]; then
for patch_url in ${SHULKER_PROXY_PATCH_URLS//;/ }; do
(cd "${SHULKER_PROXY_DATA_DIR}" && wget "${patch_url}" -O - | tar -xzv)
done
Expand Down
1 change: 1 addition & 0 deletions packages/shulker-operator/assets/proxy-probe-readiness.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh

set -euo pipefail
set -o xtrace

Expand Down
6 changes: 3 additions & 3 deletions packages/shulker-operator/assets/server-init-fs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ if [ "${SHULKER_VERSION_CHANNEL}" == "Paper" ] || [ "${SHULKER_VERSION_CHANNEL}"
cp "${SHULKER_CONFIG_DIR}/paper-global-config.yml" "${SHULKER_SERVER_CONFIG_DIR}/config/paper-global.yml"
fi

if [ ! -z "${SERVER_WORLD_URL}" ]; then
if [ ! -z "${SERVER_WORLD_URL:-}" ]; then
(cd "${SHULKER_SERVER_CONFIG_DIR}" && wget "${SERVER_WORLD_URL}" -O - | tar -xzv)
fi

if [ ! -z "${SHULKER_SERVER_PLUGIN_URLS}" ]; then
if [ ! -z "${SHULKER_SERVER_PLUGIN_URLS:-}" ]; then
mkdir -p "${SHULKER_SERVER_CONFIG_DIR}/plugins"
for plugin_url in ${SHULKER_SERVER_PLUGIN_URLS//;/ }; do
(cd "${SHULKER_SERVER_CONFIG_DIR}/plugins" && wget "${plugin_url}")
done
fi

if [ ! -z "${SHULKER_SERVER_PATCH_URLS}" ]; then
if [ ! -z "${SHULKER_SERVER_PATCH_URLS:-}" ]; then
for patch_url in ${SHULKER_SERVER_PATCH_URLS//;/ }; do
(cd "${SHULKER_SERVER_CONFIG_DIR}" && wget "${patch_url}" -O - | tar -xzv)
done
Expand Down

0 comments on commit b237790

Please sign in to comment.