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

View File

@ -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");

View File

@ -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")