From 34500632d4b0f04dd84c875c291c14b4d1dc161e Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Mon, 5 Aug 2013 10:46:54 +0100
Subject: [PATCH] Accept SPRING_HOME if already set

---
 spring-boot-cli/src/main/scripts/spring | 34 +++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/spring-boot-cli/src/main/scripts/spring b/spring-boot-cli/src/main/scripts/spring
index aa8423328eb..66c52be8831 100755
--- a/spring-boot-cli/src/main/scripts/spring
+++ b/spring-boot-cli/src/main/scripts/spring
@@ -54,22 +54,24 @@ if [ ! -f "${JAVA_HOME}/bin/java" ]; then
 fi
 
 # Attempt to find SPRING_HOME if not already set
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-	ls=`ls -ld "$PRG"`
-	link=`expr "$ls" : '.*-> \(.*\)$'`
-	if expr "$link" : '/.*' > /dev/null; then
-		PRG="$link"
-	else
-		PRG=`dirname "$PRG"`"/$link"
-	fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/../" >&-
-SPRING_HOME="`pwd -P`"
-cd "$SAVED" >&-
+if [ -z "${SPRING_HOME}" ]; then
+    # Resolve links: $0 may be a link
+    PRG="$0"
+    # Need this for relative symlinks.
+    while [ -h "$PRG" ] ; do
+	    ls=`ls -ld "$PRG"`
+	    link=`expr "$ls" : '.*-> \(.*\)$'`
+	    if expr "$link" : '/.*' > /dev/null; then
+		    PRG="$link"
+	    else
+		    PRG=`dirname "$PRG"`"/$link"
+	    fi
+    done
+    SAVED="`pwd`"
+    cd "`dirname \"$PRG\"`/../" >&-
+    SPRING_HOME="`pwd -P`"
+    cd "$SAVED" >&-
+fi
 
 if [ ! -d "${SPRING_HOME}" ]; then
 	echo "Not a directory: SPRING_HOME=${SPRING_HOME}"