From 695fae915b10a29acb82b2a83a22778a9cc4f41b Mon Sep 17 00:00:00 2001 From: Kris Lamoureux Date: Sun, 26 May 2024 21:47:55 -0400 Subject: [PATCH] Handle diff nonzero return in set_eula - Suppress nonzero return code from diff - Remove false fix `return 0` --- entrypoint.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 807bef7..7141d47 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eux # Set eula value in eula.txt set_eula() { @@ -7,9 +7,8 @@ set_eula() { EULA="${1:-false}" EULAFILE="${EULAFILE:-/app/eula.txt}" sed -i.bak "s/^eula=.*\$/eula=${EULA:-false}/" "$EULAFILE" - diff --unified=1 "${EULAFILE}.bak" "$EULAFILE" + diff --unified=1 "${EULAFILE}.bak" "$EULAFILE" || true rm "${EULAFILE}.bak" - return 0 } # Update server.properties using env