mirror of
https://github.com/jetty/jetty.project.git
synced 2025-03-01 19:39:21 +00:00
396572 - Starting jetty from cygwin is not working properly
+ Fixing #!/usr/bin/env bash (it had extra spaces at end which breaks env lookup on cygwin) + Using cygpath -w liberally to allow java started from cygwin to find resources using windows specific path names.
This commit is contained in:
parent
840316797d
commit
45bcb6df3a
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Startup script for jetty under *nix systems (it works under NT/cygwin too).
|
||||
|
||||
@ -278,6 +278,12 @@ if [ -z "$JETTY_STATE" ]
|
||||
then
|
||||
JETTY_STATE=$JETTY_BASE/${NAME}.state
|
||||
fi
|
||||
|
||||
case "`uname`" in
|
||||
CYGWIN*) JETTY_STATE="`cygpath -w $JETTY_STATE`";;
|
||||
esac
|
||||
|
||||
|
||||
JETTY_ARGS+=("jetty.state=$JETTY_STATE")
|
||||
rm -f $JETTY_STATE
|
||||
|
||||
@ -340,6 +346,11 @@ then
|
||||
fi
|
||||
if [ "$JETTY_LOGS" ]
|
||||
then
|
||||
|
||||
case "`uname`" in
|
||||
CYGWIN*) JETTY_LOGS="`cygpath -w $JETTY_LOGS`";;
|
||||
esac
|
||||
|
||||
JAVA_OPTIONS+=("-Djetty.logs=$JETTY_LOGS")
|
||||
fi
|
||||
|
||||
@ -355,6 +366,15 @@ esac
|
||||
#####################################################
|
||||
# Add jetty properties to Java VM options.
|
||||
#####################################################
|
||||
|
||||
case "`uname`" in
|
||||
CYGWIN*)
|
||||
JETTY_HOME="`cygpath -w $JETTY_HOME`"
|
||||
JETTY_BASE="`cygpath -w $JETTY_BASE`"
|
||||
TMPDIR="`cygpath -w $TMPDIR`"
|
||||
;;
|
||||
esac
|
||||
|
||||
JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
|
||||
|
||||
#####################################################
|
||||
@ -369,6 +389,10 @@ then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "`uname`" in
|
||||
CYGWIN*) JETTY_START="`cygpath -w $JETTY_START`";;
|
||||
esac
|
||||
|
||||
RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" ${JETTY_ARGS[*]})
|
||||
RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user