Fix ordering snafu with container properties and shutdown

This commit is contained in:
Dave Syer 2013-04-30 17:05:30 +01:00
parent 833b13bbbc
commit 0a58e560b3

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# OS specific support (must be 'true' or 'false').
cygwin=false;
@ -49,6 +49,7 @@ fi
if [ "$SPRING_HOME" == "" ]; then
SPRING_HOME=`cd "$(dirname $0)"/.. && pwd`
fi
SPRING_HOME=`cd "${SPRING_HOME}" && pwd`
SPRING_BIN=$(dirname $0)
TARGETDIR=target/classes
@ -59,12 +60,16 @@ mkdir -p "${TARGETDIR%/}"
CLASSPATH="${CLASSPATH}":"${SPRING_BIN}":"${TARGETDIR}"
if [ ! "${SPRING_BIN}" == "${SPRING_HOME}" ]; then
CLASSPATH="${CLASSPATH}":"${SPRING_HOME}"/classes
fi
for f in "${SPRING_HOME}"/lib/*.jar; do
CLASSPATH="${CLASSPATH}":$f
[ -f $f ] && CLASSPATH="${CLASSPATH}":$f
done
for f in "${SPRING_HOME}"/*.jar; do
CLASSPATH="${CLASSPATH}":$f
[ -f $f ] && CLASSPATH="${CLASSPATH}":$f
done
if $cygwin; then