[maven-mvnd] branch master updated: Discover mvnd.home by looking for the mvnd-daemon jar in lib or lib/ext

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git


The following commit(s) were added to refs/heads/master by this push:
     new 4833e6f7 Discover mvnd.home by looking for the mvnd-daemon jar in lib 
or lib/ext
4833e6f7 is described below

commit 4833e6f73f01d72eecfe2b8b1f3d0bd90d125e74
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Sat Jan 28 14:06:34 2023 +0100

    Discover mvnd.home by looking for the mvnd-daemon jar in lib or lib/ext
---
 .../src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java 
b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index 7dfa00be..639fe873 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@ -122,9 +122,9 @@ public class DaemonParameters {
         if (Environment.isNative() && cmd.isPresent()) {
             final Path mvndH = Paths.get(cmd.get()).getParent().getParent();
             if (mvndH != null) {
-                final Path mvndDaemonLib = mvndH.resolve(
-                        "lib/mvnd-daemon-" + 
BuildProperties.getInstance().getVersion() + ".jar");
-                if (Files.exists(mvndDaemonLib)) {
+                Path mvndDaemon = Paths.get("mvnd-daemon-" + 
BuildProperties.getInstance().getVersion() + ".jar");
+                if (Files.exists(mvndH.resolve("lib").resolve(mvndDaemon))
+                        || 
Files.exists(mvndH.resolve("lib").resolve("ext").resolve(mvndDaemon))) {
                     return mvndH.toString();
                 }
             }