From 238cfc7ded8a511d891117a672285ec50dd2546a Mon Sep 17 00:00:00 2001
From: srnyx <25808801+srnyx@users.noreply.github.com>
Date: Fri, 23 Aug 2024 22:50:31 -0400
Subject: [PATCH] Remove `eval echo "$(cat -)"`

Everything still works as normal and this actually fixes complex startup commands as PR #259 was supposed to do
---
 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 da32902ec..d86fe45c0 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 -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
+PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
 # 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 a339c0a75..51300ce17 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 -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
+PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
 # 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 ad6c37dd9..898910a6e 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 -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
+PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
 # 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 94c36c395..3eb25df0d 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 -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
+PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
 # 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 e63ff64ba..2d07411f4 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 -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
+PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
 # 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 8e2fb1916..16a19f13c 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 -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat -)")
+PARSED=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 
 # Display the command we're running in the output, and then execute it with the env
 # from the container itself.