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

Added backward compatibility to Bash versions prior to version 3.1. The += notation is supported since Bash 3.1, but Jetty is deployed in evironments where it is impossible to upgrade Bash. This commit replace the += notation by a more portable notation. 

Also-by:  Louis-Félix Tessier <louisfelix@gmail.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
This commit is contained in:
Greg Wilkins 2014-11-05 13:15:38 -05:00
parent d1ead3dcd6
commit 18ed9af658
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ CYGWIN*) JETTY_STATE="`cygpath -w $JETTY_STATE`";;
esac
JETTY_ARGS+=("jetty.state=$JETTY_STATE")
JETTY_ARGS=("$JETTY_ARGS" "jetty.state=$JETTY_STATE")
rm -f $JETTY_STATE
##################################################
@ -307,14 +307,14 @@ then
do
if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ]
then
JETTY_ARGS+=("$XMLFILE")
JETTY_ARGS=("$JETTY_ARGS" "$XMLFILE")
else
echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'"
fi
done
else
# assume it's a command line parameter (let start.jar deal with its validity)
JETTY_ARGS+=("$CONF")
JETTY_ARGS=("$JETTY_ARGS" "$CONF")
fi
done < "$JETTY_CONF"
fi
@ -351,7 +351,7 @@ then
CYGWIN*) JETTY_LOGS="`cygpath -w $JETTY_LOGS`";;
esac
JAVA_OPTIONS+=("-Djetty.logs=$JETTY_LOGS")
JAVA_OPTIONS=("$JAVA_OPTIONS" "-Djetty.logs=$JETTY_LOGS")
fi
#####################################################
@ -375,7 +375,7 @@ TMPDIR="`cygpath -w $TMPDIR`"
;;
esac
JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
JAVA_OPTIONS=("$JAVA_OPTIONS" "-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
#####################################################
# This is how the Jetty server will be started