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

Moving --daemon out from all actions to just start 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1966 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Joakim Erdfelt 2010-06-09 23:40:32 +00:00
parent 949ccb5598
commit a518e97491
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-distribution/src/main/resources/bin/jetty.sh
View File

@ -430,7 +430,7 @@ JETTY_START=$JETTY_HOME/start.jar
START_INI=$(dirname $JETTY_START)/start.ini
[ -r "$START_INI" ] || START_INI=""
RUN_ARGS=("${JAVA_OPTIONS[@]}" -jar "$JETTY_START" --daemon $JETTY_ARGS "${CONFIGS[@]}")
RUN_ARGS=("${JAVA_OPTIONS[@]}" -jar "$JETTY_START" $JETTY_ARGS "${CONFIGS[@]}")
RUN_CMD=("$JAVA" "${RUN_ARGS[@]}")
#####################################################
@ -466,7 +466,7 @@ case "$ACTION" in
then
[ -z "$JETTY_USER" ] && JETTY_USER=$USER
(( UID == 0 )) && CH_USER=-c$JETTY_USER
if start-stop-daemon -S -p"$JETTY_PID" "$CH_USER" -d"$JETTY_HOME" -b -m -a "$JAVA" -- "${RUN_ARGS[@]}"
if start-stop-daemon -S -p"$JETTY_PID" "$CH_USER" -d"$JETTY_HOME" -b -m -a "$JAVA" -- "${RUN_ARGS[@]} --daemon"
then
sleep 1
if running "$JETTY_PID"
@ -497,7 +497,7 @@ case "$ACTION" in
chown "$JETTY_USER" "$JETTY_PID"
# FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc.
su - "$JETTY_USER" -c "
${RUN_CMD[*]} &
${RUN_CMD[*]} --daemon &
disown \$!
echo \$! > '$JETTY_PID'"
else