AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #221 from neuweiler/master

Browse Source 
allow appbase and latest URL to use ENV variables too
This commit is contained in:
Michael Bayne
2019-05-28 10:27:31 -07:00
committed by GitHub
parent 604c917f3b c8901cadf2
commit 1ba5e5542c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/threerings/getdown/data/Application.java
+6 -2
View File
@@ -587,7 +587,7 @@ public class Application
} }
// check if we're overriding the domain in the appbase // 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 // make sure there's a trailing slash
if (!_appbase.endsWith("/")) { if (!_appbase.endsWith("/")) {
@@ -606,7 +606,7 @@ public class Application
} }
// check for a latest config URL // check for a latest config URL
String latest = config.getString("latest"); String latest = processArg(config.getString("latest"));
if (latest != null) { if (latest != null) {
if (latest.startsWith(_appbase)) { if (latest.startsWith(_appbase)) {
latest = _appbase + latest.substring(_appbase.length()); latest = _appbase + latest.substring(_appbase.length());
@@ -1121,6 +1121,10 @@ public class Application
/** Replaces the application directory and version in any argument. */ /** Replaces the application directory and version in any argument. */
protected String processArg (String arg) protected String processArg (String arg)
{ {
if (arg == null) {
return null;
}
arg = arg.replace("%APPDIR%", getAppDir().getAbsolutePath()); arg = arg.replace("%APPDIR%", getAppDir().getAbsolutePath());
arg = arg.replace("%VERSION%", String.valueOf(_version)); arg = arg.replace("%VERSION%", String.valueOf(_version));