Skip to content

Commit 3db5843

Browse files
committed
Polish "Find .conf file next to symlink to jar that's using the launch script"
Closes gh-8988
1 parent 56a5888 commit 3db5843

File tree

2 files changed

+1
-2
lines changed
  • spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript
  • spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools

2 files changed

+1
-2
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ public void launchWithDoubleLinkSingleJavaOpt() throws Exception {
200200
doLaunch("launch-with-double-link-single-java-opt.sh");
201201
}
202202

203-
204203
@Test
205204
public void launchWithMultipleJavaOpts() throws Exception {
206205
doLaunch("launch-with-multiple-java-opts.sh");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ while [[ -L "$jarfile" ]]; do
3535
if [[ "$jarfile" =~ init\.d ]]; then
3636
init_script=$(basename "$jarfile")
3737
else
38-
# while looping check if their is any configuration file
3938
configfile="${jarfile%.*}.conf"
39+
# shellcheck source=/dev/null
4040
[[ -r ${configfile} ]] && source "${configfile}"
4141
fi
4242
jarfile=$(readlink "$jarfile")

0 commit comments

Comments
 (0)