From ed5deaff20ab40bb3be8d7bb8cc744d220a72874 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Tue, 10 Nov 2020 09:11:34 -0500 Subject: [PATCH] use os env path --- .../wizard/server/config/PgRestServerConfiguration.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java index ed0bef7..950e8d9 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java @@ -234,12 +234,14 @@ public class PgRestServerConfiguration extends RestServerConfiguration implement String dbPass = getDatabase().getPassword(); if (empty(dbPass)) dbPass = ""; - final Map env = new HashMap<>(); - env.putAll(getEnvironment()); + final Map env = new HashMap<>(getEnvironment()); env.put(ENV_PGPASSWORD, dbPass); String path = env.get("PATH"); if (path == null) { - path = "/bin:/usr/bin:/usr/local/bin"; + path = System.getenv("PATH"); + if (empty(path)) { + path = "/bin:/usr/bin:/usr/local/bin"; + } } else { path += ":/usr/local/bin"; }