Commit 3db5843c authored by Andy Wilkinson's avatar Andy Wilkinson

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

Closes gh-8988
parent 56a58880
...@@ -200,7 +200,6 @@ public class SysVinitLaunchScriptIT { ...@@ -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");
......
...@@ -35,8 +35,8 @@ while [[ -L "$jarfile" ]]; do ...@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment