Skip to content

Commit

Permalink
Use posix test and set syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
gregw committed Oct 6, 2017
1 parent 4d6cb91 commit 04cd3eb
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 49 deletions.
10 changes: 3 additions & 7 deletions 9.2-jre7/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
set -- java -jar "$JETTY_HOME/start.jar" "$@"
fi

if [ -z "$TMPDIR" ] ; then
TMPDIR=/tmp/jetty
mkdir $TMPDIR 2>/dev/null
fi
: ${TMPDIR:=/tmp/jetty}
[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null

if [ -z "$JETTY_START" ] ; then
JETTY_START=$JETTY_BASE/jetty.start
fi
: ${JETTY_START:=$JETTY_BASE/jetty.start}

case "$JAVA_OPTIONS" in
*-Djava.io.tmpdir=*) ;;
Expand Down
10 changes: 3 additions & 7 deletions 9.2-jre8/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
set -- java -jar "$JETTY_HOME/start.jar" "$@"
fi

if [ -z "$TMPDIR" ] ; then
TMPDIR=/tmp/jetty
mkdir $TMPDIR 2>/dev/null
fi
: ${TMPDIR:=/tmp/jetty}
[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null

if [ -z "$JETTY_START" ] ; then
JETTY_START=$JETTY_BASE/jetty.start
fi
: ${JETTY_START:=$JETTY_BASE/jetty.start}

case "$JAVA_OPTIONS" in
*-Djava.io.tmpdir=*) ;;
Expand Down
10 changes: 3 additions & 7 deletions 9.3-jre8/alpine/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
set -- java -jar "$JETTY_HOME/start.jar" "$@"
fi

if [ -z "$TMPDIR" ] ; then
TMPDIR=/tmp/jetty
mkdir $TMPDIR 2>/dev/null
fi
: ${TMPDIR:=/tmp/jetty}
[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null

if [ -z "$JETTY_START" ] ; then
JETTY_START=$JETTY_BASE/jetty.start
fi
: ${JETTY_START:=$JETTY_BASE/jetty.start}

case "$JAVA_OPTIONS" in
*-Djava.io.tmpdir=*) ;;
Expand Down
10 changes: 3 additions & 7 deletions 9.3-jre8/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
set -- java -jar "$JETTY_HOME/start.jar" "$@"
fi

if [ -z "$TMPDIR" ] ; then
TMPDIR=/tmp/jetty
mkdir $TMPDIR 2>/dev/null
fi
: ${TMPDIR:=/tmp/jetty}
[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null

if [ -z "$JETTY_START" ] ; then
JETTY_START=$JETTY_BASE/jetty.start
fi
: ${JETTY_START:=$JETTY_BASE/jetty.start}

case "$JAVA_OPTIONS" in
*-Djava.io.tmpdir=*) ;;
Expand Down
10 changes: 3 additions & 7 deletions 9.4-jre8/alpine/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
set -- java -jar "$JETTY_HOME/start.jar" "$@"
fi

if [ -z "$TMPDIR" ] ; then
TMPDIR=/tmp/jetty
mkdir $TMPDIR 2>/dev/null
fi
: ${TMPDIR:=/tmp/jetty}
[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null

if [ -z "$JETTY_START" ] ; then
JETTY_START=$JETTY_BASE/jetty.start
fi
: ${JETTY_START:=$JETTY_BASE/jetty.start}

case "$JAVA_OPTIONS" in
*-Djava.io.tmpdir=*) ;;
Expand Down
10 changes: 3 additions & 7 deletions 9.4-jre8/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
set -- java -jar "$JETTY_HOME/start.jar" "$@"
fi

if [ -z "$TMPDIR" ] ; then
TMPDIR=/tmp/jetty
mkdir $TMPDIR 2>/dev/null
fi
: ${TMPDIR:=/tmp/jetty}
[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null

if [ -z "$JETTY_START" ] ; then
JETTY_START=$JETTY_BASE/jetty.start
fi
: ${JETTY_START:=$JETTY_BASE/jetty.start}

case "$JAVA_OPTIONS" in
*-Djava.io.tmpdir=*) ;;
Expand Down
10 changes: 3 additions & 7 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,10 @@ if ! command -v -- "$1" >/dev/null 2>&1 ; then
set -- java -jar "$JETTY_HOME/start.jar" "$@"
fi

if [ -z "$TMPDIR" ] ; then
TMPDIR=/tmp/jetty
mkdir $TMPDIR 2>/dev/null
fi
: ${TMPDIR:=/tmp/jetty}
[ -d "$TMPDIR" ] || mkdir -p $TMPDIR 2>/dev/null

if [ -z "$JETTY_START" ] ; then
JETTY_START=$JETTY_BASE/jetty.start
fi
: ${JETTY_START:=$JETTY_BASE/jetty.start}

case "$JAVA_OPTIONS" in
*-Djava.io.tmpdir=*) ;;
Expand Down

0 comments on commit 04cd3eb

Please sign in to comment.