Fix #7754 - Allow JETTY_SYS_PROPS to be configured by /etc/default/

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Apr 1, 2022 · 37b32d0 · 37b32d0
1 parent 0f048ea
commit 37b32d0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/jetty-home/src/main/resources/bin/jetty.sh b/jetty-home/src/main/resources/bin/jetty.sh
@@ -414,7 +414,8 @@ TMPDIR="`cygpath -w $TMPDIR`"
 ;;
 esac
 
-JETTY_SYS_PROPS=$(echo -ne "-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
+BASE_JETTY_SYS_PROPS=$(echo -ne "-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
+JETTY_SYS_PROPS=(${JETTY_SYS_PROPS[*]} $BASE_JETTY_SYS_PROPS)
 
 #####################################################
 # This is how the Jetty server will be started