From 7ac950ba0e3a05c84f55db8c0fdd211e19914584 Mon Sep 17 00:00:00 2001 From: srnyx <25808801+srnyx@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:34:03 -0400 Subject: [PATCH] Change `echo "${STARTUP}"` to `echo -e ${STARTUP}` All other `entrypoint.sh` files use this change, so just making the incorrect ones match the rest It also caused issues with complex startup commands that utilize if statements and such, so hopefully this fixes those issues --- cassandra/entrypoint.sh | 2 +- erlang/entrypoint.sh | 2 +- go/entrypoint.sh | 2 +- java/entrypoint.sh | 2 +- oses/alpine/entrypoint.sh | 2 +- voice/teaspeak/entrypoint.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cassandra/entrypoint.sh b/cassandra/entrypoint.sh index 36d42cd..da32902 100644 --- a/cassandra/entrypoint.sh +++ b/cassandra/entrypoint.sh @@ -29,7 +29,7 @@ fi # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically # replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") +PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") # Display the command we're running in the output, and then execute it with the env # from the container itself. diff --git a/erlang/entrypoint.sh b/erlang/entrypoint.sh index b54a17b..a339c0a 100644 --- a/erlang/entrypoint.sh +++ b/erlang/entrypoint.sh @@ -16,7 +16,7 @@ erl -noshell -eval 'erlang:display(erlang:system_info(system_version))' -eval 'i # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically # replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") +PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") # Display the command we're running in the output, and then execute it with the env # from the container itself. diff --git a/go/entrypoint.sh b/go/entrypoint.sh index 402f6d4..ad6c37d 100644 --- a/go/entrypoint.sh +++ b/go/entrypoint.sh @@ -40,7 +40,7 @@ go version # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically # replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") +PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") # Display the command we're running in the output, and then execute it with the env # from the container itself. diff --git a/java/entrypoint.sh b/java/entrypoint.sh index 76e79e0..94c36c3 100755 --- a/java/entrypoint.sh +++ b/java/entrypoint.sh @@ -40,7 +40,7 @@ java -version # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically # replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") +PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") # Display the command we're running in the output, and then execute it with the env # from the container itself. diff --git a/oses/alpine/entrypoint.sh b/oses/alpine/entrypoint.sh index 3118289..e63ff64 100644 --- a/oses/alpine/entrypoint.sh +++ b/oses/alpine/entrypoint.sh @@ -34,7 +34,7 @@ cd /home/container || exit 1 # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically # replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") +PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") # Display the command we're running in the output, and then execute it with the env # from the container itself. diff --git a/voice/teaspeak/entrypoint.sh b/voice/teaspeak/entrypoint.sh index 9fa5709..8e2fb19 100644 --- a/voice/teaspeak/entrypoint.sh +++ b/voice/teaspeak/entrypoint.sh @@ -15,7 +15,7 @@ echo "installed youtube-dl Version:" # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically # replacing the values. -PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") +PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)") # Display the command we're running in the output, and then execute it with the env # from the container itself.