Commit a9700c92 authored by Phillip Webb's avatar Phillip Webb

Fix a few problems with spring start script

Fixed a few issues with the spring start script, mainly around symlinks.
Test on OSX, Ubuntu and Windows (Cygwin) with and would symlinks.
parent 94855bf4
#!/bin/bash #!/usr/bin/env bash
# OS specific support (must be 'true' or 'false'). # OS specific support (must be 'true' or 'false').
cygwin=false; cygwin=false;
...@@ -7,14 +7,21 @@ case "`uname`" in ...@@ -7,14 +7,21 @@ case "`uname`" in
CYGWIN*) CYGWIN*)
cygwin=true cygwin=true
;; ;;
Darwin*) Darwin*)
darwin=true darwin=true
;; ;;
esac esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to find JAVA_HOME if not already set
if [ -z "${JAVA_HOME}" ]; then if [ -z "${JAVA_HOME}" ]; then
if $darwin ; then if $darwin ; then
[ -z "$JAVA_HOME" -a -f "/usr/libexec/java_home" ] && export JAVA_HOME=`/usr/libexec/java_home` [ -z "$JAVA_HOME" -a -f "/usr/libexec/java_home" ] && export JAVA_HOME=`/usr/libexec/java_home`
[ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home" [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
[ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home" [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
...@@ -32,6 +39,7 @@ if [ -z "${JAVA_HOME}" ]; then ...@@ -32,6 +39,7 @@ if [ -z "${JAVA_HOME}" ]; then
fi fi
fi fi
# Sanity check that we have java
if [ ! -f "${JAVA_HOME}/bin/java" ]; then if [ ! -f "${JAVA_HOME}/bin/java" ]; then
echo "" echo ""
echo "======================================================================================================" echo "======================================================================================================"
...@@ -46,25 +54,31 @@ if [ ! -f "${JAVA_HOME}/bin/java" ]; then ...@@ -46,25 +54,31 @@ if [ ! -f "${JAVA_HOME}/bin/java" ]; then
exit 1 exit 1
fi fi
if [ "$SPRING_HOME" == "" ]; then # Attempt to find SPRING_HOME if not already set
script=`readlink $0` # Resolve links: $0 may be a link
SPRING_HOME=`cd "$(dirname $script)"/.. && pwd` PRG="$0"
else # Need this for relative symlinks.
if [ ! -d "${SPRING_HOME}" ]; then while [ -h "$PRG" ] ; do
echo "Not a directory: SPRING_HOME=${SPRING_HOME}" ls=`ls -ld "$PRG"`
echo "Please rectify and restart." link=`expr "$ls" : '.*-> \(.*\)$'`
exit 2 if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi fi
SPRING_HOME=`cd "${SPRING_HOME}" && pwd` done
fi SAVED="`pwd`"
SPRING_BIN=$(dirname $0) cd "`dirname \"$PRG\"`/../" >&-
SPRING_HOME="`pwd -P`"
cd "$SAVED" >&-
TARGETDIR=target/classes if [ ! -d "${SPRING_HOME}" ]; then
if [ -f build.gradle ]; then echo "Not a directory: SPRING_HOME=${SPRING_HOME}"
TARGETDIR=build/classes/main echo "Please rectify and restart."
exit 2
fi fi
for f in . "${TARGETDIR}" "${SPRING_HOME}"/classes "${SPRING_BIN}" "${SPRING_HOME}"/*.jar "${SPRING_HOME}"/lib/*.jar; do for f in "${SPRING_HOME}"/classes "${SPRING_HOME}"/*.jar "${SPRING_HOME}"/lib/*.jar; do
if [ -f $f -o -d $f ]; then if [ -f $f -o -d $f ]; then
if [ "${CLASSPATH}" == "" ]; then if [ "${CLASSPATH}" == "" ]; then
CLASSPATH="${f}" CLASSPATH="${f}"
...@@ -75,7 +89,8 @@ for f in . "${TARGETDIR}" "${SPRING_HOME}"/classes "${SPRING_BIN}" "${SPRING_HOM ...@@ -75,7 +89,8 @@ for f in . "${TARGETDIR}" "${SPRING_HOME}"/classes "${SPRING_BIN}" "${SPRING_HOM
done done
if $cygwin; then if $cygwin; then
SPRING_HOME=`cygpath --path --mixed "$SPRING_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
fi fi
${JAVA_HOME}/bin/java ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.boot.cli.SpringCli $* "${JAVA_HOME}/bin/java ${JAVA_OPTS}" -cp "$CLASSPATH" org.springframework.boot.cli.SpringCli $*
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment