root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish "Find .conf file next to symlink to jar that's using the launch script" 

Closes gh-8988
This commit is contained in:
Andy Wilkinson 2017-09-26 14:42:18 +01:00
parent 56a5888008
commit 3db5843c8b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,6 @@ public class SysVinitLaunchScriptIT {
doLaunch("launch-with-double-link-single-java-opt.sh"); doLaunch("launch-with-double-link-single-java-opt.sh");
} }
@Test @Test
public void launchWithMultipleJavaOpts() throws Exception { public void launchWithMultipleJavaOpts() throws Exception {
doLaunch("launch-with-multiple-java-opts.sh"); doLaunch("launch-with-multiple-java-opts.sh");

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

@ -35,8 +35,8 @@ while [[ -L "$jarfile" ]]; do
if [[ "$jarfile" =~ init\.d ]]; then if [[ "$jarfile" =~ init\.d ]]; then
init_script=$(basename "$jarfile") init_script=$(basename "$jarfile")
else else
# while looping check if their is any configuration file
configfile="${jarfile%.*}.conf" configfile="${jarfile%.*}.conf"
# shellcheck source=/dev/null
[[ -r ${configfile} ]] && source "${configfile}" [[ -r ${configfile} ]] && source "${configfile}"
fi fi
jarfile=$(readlink "$jarfile") jarfile=$(readlink "$jarfile")