From 3fb06899374022014bce63d436f568f263af691a Mon Sep 17 00:00:00 2001 From: Charlie Groves Date: Wed, 25 Feb 2009 00:30:14 +0000 Subject: [PATCH] Due to cutbacks, environment.txt is now called env.txt. Also, yohoho released with the environment clobbering version of getdown from r274, and that environment clobbering seems to prevent launching on Linux and some Windows installs. Now if we want to release with the fixed version of environment setting and an environment.txt, the clobbering version will run as part of the update, process the newly downloaded environment.txt, and never launch again. By renaming it env.txt, we can skirt around that whole fiasco and environment setting won't go into effect until the new getdown is running. --- src/java/com/threerings/getdown/data/Application.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/getdown/data/Application.java b/src/java/com/threerings/getdown/data/Application.java index 163e272..bd595fe 100644 --- a/src/java/com/threerings/getdown/data/Application.java +++ b/src/java/com/threerings/getdown/data/Application.java @@ -769,7 +769,7 @@ public class Application } - String[] envp = createEnvironment (); + String[] envp = createEnvironment(); String[] sargs = new String[args.size()]; args.toArray(sargs); log.info("Running " + StringUtil.join(sargs, "\n ")); @@ -788,7 +788,7 @@ public class Application protected String[] createEnvironment () { List envvar = new ArrayList(); - fillAssignmentListFromPairs("environment.txt", envvar); + fillAssignmentListFromPairs("env.txt", envvar); if (envvar.isEmpty()) { log.info("Didn't find any custom environment variables, not setting any."); return null;