Merge branch '1.4.x' into 1.5.x

spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java

@@ -207,7 +207,12 @@ public class SysVinitLaunchScriptIT {
 				coloredString(AnsiColor.GREEN, "Running [" + extractPid(output) + "]"));
 		assertThat(output).has(
 				coloredString(AnsiColor.GREEN, "Stopped [" + extractPid(output) + "]"));
+	}
 
+	@Test
+	public void launchWithRelativeLogFolder() throws Exception {
+		String output = doTest("launch-with-relative-log-folder.sh");
+		assertThat(output).contains("Log written");
 	}
 
 	private void doLaunch(String script) throws Exception {

spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh

@@ -0,0 +1,8 @@
+source ./test-functions.sh
+mkdir ./pid
+install_service
+echo 'LOG_FOLDER=log' > /test-service/spring-boot-app.conf
+mkdir -p /test-service/log
+start_service
+await_app
+[[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written"

spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-pid-folder.sh

@@ -1,7 +1,7 @@
 source ./test-functions.sh
-mkdir ./pid
 install_service
-echo 'PID_FOLDER=./pid' > /test-service/spring-boot-app.conf
+mkdir /test-service/pid
+echo 'PID_FOLDER=pid' > /test-service/spring-boot-app.conf
 start_service
 echo "PID: $(cat /test-service/pid/spring-boot-app/spring-boot-app.pid)"
 await_app

spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script

@@ -52,6 +52,8 @@ configfile="$(basename "${jarfile%.*}.conf")"
 # Initialize PID/LOG locations if they weren't provided by the config file
 [[ -z "$PID_FOLDER" ]] && PID_FOLDER="{{pidFolder:/var/run}}"
 [[ -z "$LOG_FOLDER" ]] && LOG_FOLDER="{{logFolder:/var/log}}"
+! [[ "$PID_FOLDER" == /* ]] && PID_FOLDER="$(dirname "$jarfile")"/"$PID_FOLDER"
+! [[ "$LOG_FOLDER" == /* ]] && LOG_FOLDER="$(dirname "$jarfile")"/"$LOG_FOLDER"
 ! [[ -x "$PID_FOLDER" ]] && PID_FOLDER="/tmp"
 ! [[ -x "$LOG_FOLDER" ]] && LOG_FOLDER="/tmp"