Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11276 from jetty/fix/10.0.x/start-sh-expr-fix 

Issue #11273 - Add support for BSD based `expr` utility in `jetty.sh`
This commit is contained in:
Joakim Erdfelt 2024-01-16 10:46:23 -06:00 committed by GitHub
parent b953871c9a 65132561c6
commit d8c34c4ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-home/src/main/resources/bin/jetty.sh
View File

@ -233,7 +233,7 @@ testFileSystemPermissions()
# Don't test if setuid is specified
# as the Jetty process will switch to a different user id on startup
if expr "${JETTY_ARGS[*]}" : '.*setuid.*' >/dev/null
if expr -- "${JETTY_ARGS[*]}" : '.*setuid.*' >/dev/null
then
(( DEBUG )) && echo "Not testing file system permissions: setuid in use"
return 0
@ -459,7 +459,7 @@ then
(( DEBUG )) && echo "$JETTY_CONF: (begin read) JETTY_ARGS.length=${#JETTY_ARGS[@]}"
while read -r CONF
do
if expr "$CONF" : '#' >/dev/null ; then
if expr -- "$CONF" : '#' >/dev/null ; then
continue
fi
@ -573,7 +573,7 @@ RUN_ARGS=($JETTY_SYS_PROPS ${JETTY_DRY_RUN[@]})
if (( DEBUG ))
then
if expr "${RUN_ARGS[*]}" : '.*/etc/console-capture.xml.*' > /dev/null
if expr -- "${RUN_ARGS[*]}" : '.*/etc/console-capture.xml.*' > /dev/null
then
echo "WARNING: Disable console-capture module for best DEBUG results"
fi
@ -649,7 +649,7 @@ case "$ACTION" in
fi
if expr "${JETTY_ARGS[*]}" : '.*jetty\.state=.*' >/dev/null
if expr -- "${JETTY_ARGS[*]}" : '.*jetty\.state=.*' >/dev/null
then
if started "$JETTY_STATE" "$JETTY_PID" "$JETTY_START_TIMEOUT"
then