From 9d76846830885a33ba7e04312b448ef8a0bbc1ef Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sat, 28 Dec 2019 16:15:55 -0500
Subject: [PATCH] more flexible env access

---
 src/main/java/org/cobbzilla/util/main/BaseMainOptions.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/cobbzilla/util/main/BaseMainOptions.java b/src/main/java/org/cobbzilla/util/main/BaseMainOptions.java
index c027370..740034a 100644
--- a/src/main/java/org/cobbzilla/util/main/BaseMainOptions.java
+++ b/src/main/java/org/cobbzilla/util/main/BaseMainOptions.java
@@ -7,6 +7,7 @@ import org.kohsuke.args4j.Option;
 
 import java.io.*;
 import java.lang.reflect.Field;
+import java.util.Map;
 
 import static org.cobbzilla.util.daemon.ZillaRuntime.*;
 
@@ -69,11 +70,11 @@ public class BaseMainOptions {
         }
     }
 
-    public static String keyValue(String v, String desc) {
+    public String keyValue(String v, String desc) {
         if (empty(v)) return v;
         if (!v.startsWith("@")) return v;
         final String varOrFile = v.substring(1);
-        final String envVal = System.getenv(varOrFile);
+        final String envVal = getEnv().get(varOrFile);
         if (!empty(envVal)) return envVal;
         try {
             return FileUtil.toString(varOrFile);
@@ -84,4 +85,6 @@ public class BaseMainOptions {
         }
     }
 
+    public Map<String, String> getEnv() { return System.getenv(); }
+
 }