Commit caa4c165 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x'

Closes gh-18084
parents 6017f2f5 7150f121
...@@ -87,10 +87,10 @@ if [ -z "${SPRING_HOME}" ]; then ...@@ -87,10 +87,10 @@ if [ -z "${SPRING_HOME}" ]; then
fi fi
done done
SAVED="$(pwd)" SAVED="$(pwd)"
cd "$(dirname "${PRG}")/../" >&- || exit 1 cd "$(dirname "${PRG}")/../" > /dev/null || exit 1
SPRING_HOME="$(pwd -P)" SPRING_HOME="$(pwd -P)"
export SPRING_HOME export SPRING_HOME
cd "$SAVED" >&- || exit 1 cd "$SAVED" > /dev/null || exit 1
fi fi
if [ ! -d "${SPRING_HOME}" ]; then if [ ! -d "${SPRING_HOME}" ]; then
......
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