From a329c5b5410460f7dccb38dd2a729f225b8a2297 Mon Sep 17 00:00:00 2001 From: Adam Outler Date: Mon, 2 Mar 2026 19:42:29 +0000 Subject: [PATCH] Tidy up plugin logic --- .../36-override-individual-settings.sh | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/install/production-filesystem/entrypoint.d/36-override-individual-settings.sh b/install/production-filesystem/entrypoint.d/36-override-individual-settings.sh index 0ed4fc18..64b095e3 100644 --- a/install/production-filesystem/entrypoint.d/36-override-individual-settings.sh +++ b/install/production-filesystem/entrypoint.d/36-override-individual-settings.sh @@ -9,28 +9,14 @@ if [ ! -f "${NETALERTX_CONFIG}/app.conf" ]; then exit 0 fi -# Helper: set or append config key safely -set_config_value() { - _key="$1" - _value="$2" - - # Remove newlines just in case - _value=$(printf '%s' "$_value" | tr -d '\n\r') - - # Escape sed-sensitive chars - _escaped=$(printf '%s\n' "$_value" | sed 's/[\/&]/\\&/g') - - if grep -q "^${_key}=" "${NETALERTX_CONFIG}/app.conf"; then - sed -i "s|^${_key}=.*|${_key}=${_escaped}|" "${NETALERTX_CONFIG}/app.conf" - else - echo "${_key}=${_value}" >> "${NETALERTX_CONFIG}/app.conf" - fi -} - -# ------------------------------------------------------------ -# LOADED_PLUGINS override -# ------------------------------------------------------------ if [ -n "${LOADED_PLUGINS:-}" ]; then echo "[ENV] Applying LOADED_PLUGINS override" - set_config_value "LOADED_PLUGINS" "$LOADED_PLUGINS" + value=$(printf '%s' "$LOADED_PLUGINS" | tr -d '\n\r') + escaped=$(printf '%s\n' "$value" | sed 's/[\/&]/\\&/g') + + if grep -q '^LOADED_PLUGINS=' "${NETALERTX_CONFIG}/app.conf"; then + sed -i "s|^LOADED_PLUGINS=.*|LOADED_PLUGINS=${escaped}|" "${NETALERTX_CONFIG}/app.conf" + else + echo "LOADED_PLUGINS=${value}" >> "${NETALERTX_CONFIG}/app.conf" + fi fi