}
// forced by system property to not use user default appdir
- if (SysProps.noUpdate() && Boolean.valueOf(System.getProperty("no" + USER_DEFAULT_APPDIR_PROPERTY))) {
+ if (appDir == null && Boolean.valueOf(System.getProperty("no" + USER_DEFAULT_APPDIR_PROPERTY))) {
appDir = installerAppdir;
- appDirProv = "no user default";
+ appDirProv = "installer appdir";
userAppDir = false;
+ notes.add(Note.info("Not using " + USER_DEFAULT_APPDIR_PROPERTY + ", resorting to " + appDirProv + " '" + appDir +"'"));
} else if (userAppDir && installerAppdir != null) {
// we're going to try and use a different appdir, check if newer getdown-launcher.jar found there, and restart using that one
final String getdown = "getdown-launcher.jar";
import ca.beq.util.win32.registry.RootKey;
import com.threerings.getdown.data.Application;
+import com.threerings.getdown.data.SysProps;
import com.threerings.getdown.spi.ProxyAuth;
import com.threerings.getdown.util.Config;
import com.threerings.getdown.util.ConnectionUtil;
public static void configProxy (Application app, String host, String port,
String username, String password) {
// save our proxy host and port in a local file
- saveProxy(app, host, port);
+ if (!SysProps.noUpdate()) {
+ saveProxy(app, host, port);
+ }
// save our credentials via the SPI
if (!StringUtil.isBlank(username) && !StringUtil.isBlank(password)) {
public static void initProxy (Application app, String host, String port,
String username, String password)
{
-System.out.println("**** initProxy(app, '"+host+"', "+port+", '"+username+"', "+(password==null?"null":"*x"+password.length())+")");
+ log.info("initProxy:", "app", app, "host", host, "port", port, "username", username, "password", "("+(password==null?"null":"*x"+password.length())+")");
// check whether we have saved proxy credentials
String appDir = app.getAppDir().getAbsolutePath();
ServiceLoader<ProxyAuth> loader = ServiceLoader.load(ProxyAuth.class);