From f19e8f8aaabfc3f88ccf146667d6c805edeaf57a Mon Sep 17 00:00:00 2001
From: Lachlan <lachlan@webtide.com>
Date: Fri, 25 Aug 2023 18:18:19 +1000
Subject: [PATCH] Revert "Issue #153 - revert eval of terminating commands"

---
 amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh    | 3 +--
 amazoncorretto/10.0/jdk11/docker-entrypoint.sh           | 3 +--
 amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh    | 3 +--
 amazoncorretto/10.0/jdk17/docker-entrypoint.sh           | 3 +--
 amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh    | 3 +--
 amazoncorretto/11.0/jdk11/docker-entrypoint.sh           | 3 +--
 amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh    | 3 +--
 amazoncorretto/11.0/jdk17/docker-entrypoint.sh           | 3 +--
 amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh    | 3 +--
 amazoncorretto/12.0/jdk17/docker-entrypoint.sh           | 3 +--
 amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh     | 3 +--
 amazoncorretto/9.4/jdk11/docker-entrypoint.sh            | 3 +--
 amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh     | 3 +--
 amazoncorretto/9.4/jdk17/docker-entrypoint.sh            | 3 +--
 amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh      | 3 +--
 amazoncorretto/9.4/jdk8/docker-entrypoint.sh             | 3 +--
 azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh | 3 +--
 azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh | 3 +--
 azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh | 3 +--
 azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh | 3 +--
 azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh | 3 +--
 azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh  | 3 +--
 azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh  | 3 +--
 azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh   | 3 +--
 azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh        | 3 +--
 azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh        | 3 +--
 azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh        | 3 +--
 azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh        | 3 +--
 azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh        | 3 +--
 azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh         | 3 +--
 azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh         | 3 +--
 azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh          | 3 +--
 docker-entrypoint.sh                                     | 3 +--
 eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/10.0/jdk11/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/10.0/jdk17/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/10.0/jre11/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/10.0/jre17/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/11.0/jdk11/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/11.0/jdk17/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/11.0/jre11/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/11.0/jre17/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/12.0/jdk17/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh   | 3 +--
 eclipse-temurin/12.0/jre17/docker-entrypoint.sh          | 3 +--
 eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh    | 3 +--
 eclipse-temurin/9.4/jdk11/docker-entrypoint.sh           | 3 +--
 eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh    | 3 +--
 eclipse-temurin/9.4/jdk17/docker-entrypoint.sh           | 3 +--
 eclipse-temurin/9.4/jdk8/docker-entrypoint.sh            | 3 +--
 eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh    | 3 +--
 eclipse-temurin/9.4/jre11/docker-entrypoint.sh           | 3 +--
 eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh    | 3 +--
 eclipse-temurin/9.4/jre17/docker-entrypoint.sh           | 3 +--
 eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh     | 3 +--
 eclipse-temurin/9.4/jre8/docker-entrypoint.sh            | 3 +--
 64 files changed, 64 insertions(+), 128 deletions(-)

diff --git a/amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh b/amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/jdk11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/10.0/jdk11/docker-entrypoint.sh b/amazoncorretto/10.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/10.0/jdk11/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/10.0/jdk17/docker-entrypoint.sh b/amazoncorretto/10.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/10.0/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/10.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh b/amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/jdk11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/11.0/jdk11/docker-entrypoint.sh b/amazoncorretto/11.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/11.0/jdk11/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/11.0/jdk17/docker-entrypoint.sh b/amazoncorretto/11.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/11.0/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/11.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/12.0/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/12.0/jdk17/docker-entrypoint.sh b/amazoncorretto/12.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/12.0/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/12.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh b/amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/9.4/jdk11/docker-entrypoint.sh b/amazoncorretto/9.4/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/9.4/jdk11/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh b/amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/9.4/jdk17/docker-entrypoint.sh b/amazoncorretto/9.4/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/9.4/jdk17/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh b/amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk8-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/amazoncorretto/9.4/jdk8/docker-entrypoint.sh b/amazoncorretto/9.4/jdk8/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/amazoncorretto/9.4/jdk8/docker-entrypoint.sh
+++ b/amazoncorretto/9.4/jdk8/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/10.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/10.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/11.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/11.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/12.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/9.4/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/9.4/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh b/azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh
+++ b/azul/zulu-openjdk-alpine/9.4/jdk8/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/10.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/10.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/11.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/11.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/12.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh b/azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/9.4/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh b/azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/9.4/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh b/azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh
+++ b/azul/zulu-openjdk/9.4/jdk8/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jdk11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jdk11/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jdk11/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jdk17/docker-entrypoint.sh b/eclipse-temurin/10.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jre11/docker-entrypoint.sh b/eclipse-temurin/10.0/jre11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jre11/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/10.0/jre17/docker-entrypoint.sh b/eclipse-temurin/10.0/jre17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/10.0/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/10.0/jre17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jdk11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jdk11/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jdk11/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jdk17/docker-entrypoint.sh b/eclipse-temurin/11.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jre11/docker-entrypoint.sh b/eclipse-temurin/11.0/jre11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jre11/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/11.0/jre17/docker-entrypoint.sh b/eclipse-temurin/11.0/jre17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/11.0/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/11.0/jre17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/12.0/jdk17/docker-entrypoint.sh b/eclipse-temurin/12.0/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/12.0/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/jre17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/12.0/jre17/docker-entrypoint.sh b/eclipse-temurin/12.0/jre17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/12.0/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/12.0/jre17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jdk11/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jdk11/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jdk17/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jdk17/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jdk8/docker-entrypoint.sh b/eclipse-temurin/9.4/jdk8/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jdk8/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jdk8/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre11-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jre11/docker-entrypoint.sh b/eclipse-temurin/9.4/jre11/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jre11/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre11/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre17-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jre17/docker-entrypoint.sh b/eclipse-temurin/9.4/jre17/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jre17/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre17/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh b/eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre8-alpine/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done
 
diff --git a/eclipse-temurin/9.4/jre8/docker-entrypoint.sh b/eclipse-temurin/9.4/jre8/docker-entrypoint.sh
index 48830eef..e90afb9f 100755
--- a/eclipse-temurin/9.4/jre8/docker-entrypoint.sh
+++ b/eclipse-temurin/9.4/jre8/docker-entrypoint.sh
@@ -63,8 +63,7 @@ if expr "$*" : 'java .*/start\.jar.*$' >/dev/null ; then
 			shift
 			# The first $JAVA_OPTIONS is for the JVM which will do the --dry-run,
 			# the second one is used when generating the --dry-run output.
-			echo "exec " $JAVA $JAVA_OPTIONS "$@" $JAVA_OPTIONS $JETTY_PROPERTIES > $JETTY_BASE/jetty.exec
-			. $JETTY_BASE/jetty.exec
+			eval "exec $JAVA $JAVA_OPTIONS \"\$@\" $JAVA_OPTIONS $JETTY_PROPERTIES"
 		esac
 	done