From 3db5843c8b9e08562e4571a2e4ec6e547a4c62f2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 26 Sep 2017 14:42:18 +0100 Subject: [PATCH] Polish "Find .conf file next to symlink to jar that's using the launch script" Closes gh-8988 --- .../boot/launchscript/SysVinitLaunchScriptIT.java | 1 - .../org/springframework/boot/loader/tools/launch.script | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java index 10aea5d9f83..65812fdf173 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java @@ -200,7 +200,6 @@ public class SysVinitLaunchScriptIT { doLaunch("launch-with-double-link-single-java-opt.sh"); } - @Test public void launchWithMultipleJavaOpts() throws Exception { doLaunch("launch-with-multiple-java-opts.sh"); diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script index 5bc1ec1a1a8..c4124cd2970 100755 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script @@ -35,8 +35,8 @@ while [[ -L "$jarfile" ]]; do if [[ "$jarfile" =~ init\.d ]]; then init_script=$(basename "$jarfile") else - # while looping check if their is any configuration file configfile="${jarfile%.*}.conf" + # shellcheck source=/dev/null [[ -r ${configfile} ]] && source "${configfile}" fi jarfile=$(readlink "$jarfile")