From 2f2c86a9f5461426668b2aeae02b1ad8c910765a Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Sat, 25 Mar 2023 09:30:39 +0100 Subject: [PATCH] Fix bug where WmsaHome wouldn't look in /var/lib/wmsa as a fallback --- code/common/config/src/main/java/nu/marginalia/WmsaHome.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/common/config/src/main/java/nu/marginalia/WmsaHome.java b/code/common/config/src/main/java/nu/marginalia/WmsaHome.java index 984bca53..b63761b0 100644 --- a/code/common/config/src/main/java/nu/marginalia/WmsaHome.java +++ b/code/common/config/src/main/java/nu/marginalia/WmsaHome.java @@ -47,8 +47,7 @@ public class WmsaHome { // Developers probably have a "run/" somewhere upstream from cwd. // - return Stream.iterate(Paths.get("").toAbsolutePath(), Path::getParent) - .takeWhile(Files::exists) + return Stream.iterate(Paths.get("").toAbsolutePath(), f -> f != null && Files.exists(f), Path::getParent) .filter(p -> Files.exists(p.resolve("run/env"))) .filter(p -> Files.exists(p.resolve("run/setup.sh"))) .map(p -> p.resolve("run"))