From c8901cadf26be7752df124860494742dbd357c4c Mon Sep 17 00:00:00 2001
From: e507802 <e507802@sbb.ch>
Date: Tue, 28 May 2019 10:34:14 +0200
Subject: [PATCH] allow appbase and latest URL to use ENV variables too

---
 .../java/com/threerings/getdown/data/Application.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/threerings/getdown/data/Application.java b/core/src/main/java/com/threerings/getdown/data/Application.java
index 1412d8a..fa132f9 100644
--- a/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -587,7 +587,7 @@ public class Application
         }
 
         // check if we're overriding the domain in the appbase
-        _appbase = SysProps.overrideAppbase(_appbase);
+        _appbase = processArg(SysProps.overrideAppbase(_appbase));
 
         // make sure there's a trailing slash
         if (!_appbase.endsWith("/")) {
@@ -606,7 +606,7 @@ public class Application
         }
 
         // check for a latest config URL
-        String latest = config.getString("latest");
+        String latest = processArg(config.getString("latest"));
         if (latest != null) {
             if (latest.startsWith(_appbase)) {
                 latest = _appbase + latest.substring(_appbase.length());
@@ -1121,6 +1121,10 @@ public class Application
     /** Replaces the application directory and version in any argument. */
     protected String processArg (String arg)
     {
+        if (arg == null) {
+            return null;
+        }
+
         arg = arg.replace("%APPDIR%", getAppDir().getAbsolutePath());
         arg = arg.replace("%VERSION%", String.valueOf(_version));