From fea41f8c90765b783ffabe07dd7421e2677675bc Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 22 Dec 2024 21:29:25 +0000 Subject: [PATCH] Be consistent --- root/app/update-mods.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/root/app/update-mods.sh b/root/app/update-mods.sh index b3e1e6d..9de7e93 100755 --- a/root/app/update-mods.sh +++ b/root/app/update-mods.sh @@ -4,7 +4,7 @@ # Main script loop if [[ -e "/var/run/docker.sock" ]] || [[ -n "${DOCKER_HOST}" ]]; then # Mods provided via Docker - echo "[mod-init] Searching all containers for DOCKER_MODS..." + echo -e "[mod-init] Searching all containers for DOCKER_MODS..." for CONTAINER in $(docker ps -q); do CONTAINER_MODS=$(docker inspect "${CONTAINER}" | jq -r '.[].Config.Env | to_entries | map(select(.value | match("DOCKER_MODS="))) | .[].value') CONTAINER_NAME=$(docker inspect "${CONTAINER}" | jq -r .[].Name | cut -d '/' -f2) @@ -12,9 +12,9 @@ if [[ -e "/var/run/docker.sock" ]] || [[ -n "${DOCKER_HOST}" ]]; then CONTAINER_MODS=$(awk -F '=' '{print $2}' <<< "${CONTAINER_MODS}") for CONTAINER_MOD in $(tr '|' '\n' <<< "${CONTAINER_MODS}"); do if [[ "${DOCKER_MODS}" =~ ${CONTAINER_MOD} ]]; then - echo "[mod-init] ${CONTAINER_MOD} already in mod list, skipping" + echo -e "[mod-init] ${CONTAINER_MOD} already in mod list, skipping" else - echo "[mod-init] Found new mod ${CONTAINER_MODS} for container ${CONTAINER_NAME}" + echo -e "[mod-init] Found new mod ${CONTAINER_MODS} for container ${CONTAINER_NAME}" DOCKER_MODS="${DOCKER_MODS}|${CONTAINER_MOD}" DOCKER_MODS="${DOCKER_MODS#|}" fi @@ -23,10 +23,10 @@ if [[ -e "/var/run/docker.sock" ]] || [[ -n "${DOCKER_HOST}" ]]; then done fi -if [[ -n "${DOCKER_MODS+x}" ]]; then +if [[ -n "${DOCKER_MODS}" ]]; then printf %s "true" > /run/s6/container_environment/MODMANAGER_MODONLY printf %s "${DOCKER_MODS}" > /run/s6/container_environment/DOCKER_MODS exec /docker-mods else - echo "[mod-init] (ERROR) Could not find any mods in the DOCKER_MODS environment variable or via Docker" + echo -e "[mod-init] (ERROR) Could not find any mods in the DOCKER_MODS environment variable or via Docker" fi