From e5204f86aea4e1f0fd540dfe6cfa8fcd6e4799fe Mon Sep 17 00:00:00 2001
From: Lovinoes <lolprobs12@gmail.com>
Date: Wed, 21 Aug 2024 22:35:48 +0200
Subject: [PATCH] Update entrypoint.sh

---
 java-corretto/entrypoint.sh | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/java-corretto/entrypoint.sh b/java-corretto/entrypoint.sh
index 0645a0a..dccaba6 100644
--- a/java-corretto/entrypoint.sh
+++ b/java-corretto/entrypoint.sh
@@ -1,18 +1,25 @@
-#!/bin/bash
-cd /home/container || exit 1
-
-YELLOW='\033[0;33m'
-RESET_COLOR='\033[0m'
-
-java -version
+# Default the TZ environment variable to UTC.
+TZ=${TZ:-UTC}
+export TZ
 
+# Set environment variable that holds the Internal Docker IP
 INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
-# Replace Startup Variables
-# shellcheck disable=SC2086
-MODIFIED_STARTUP=$(eval echo "$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g')")
-echo -e "${YELLOW}[Startup Command]: ${MODIFIED_STARTUP} ${RESET_COLOR}"
+# Switch to the container's working directory
+cd /home/container || exit 1
 
+# Print Java version
+printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0mjava -version\n"
+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 -)")
+
+# Display the command we're running in the output, and then execute it with the env
+# from the container itself.
+printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
 # shellcheck disable=SC2086
-exec ${MODIFIED_STARTUP}
+exec env ${PARSED}