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

Move noInstall() check into install().

Browse Source
This commit is contained in:
Michael Bayne
2017-11-17 13:59:17 -08:00
parent 3b3e8be165
commit 5925a6b57c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/threerings/getdown/launcher/Getdown.java
+4 -6
View File
@@ -95,7 +95,6 @@ public abstract class Getdown extends Thread
_launchInSilent = SysProps.launchInSilent(); _launchInSilent = SysProps.launchInSilent();
} }
_delay = SysProps.startDelay(); _delay = SysProps.startDelay();
_noInstall = SysProps.noInstall();
} catch (SecurityException se) { } catch (SecurityException se) {
// don't freak out, just assume non-silent and no delay; we're probably already // don't freak out, just assume non-silent and no delay; we're probably already
// recovering from a security failure // recovering from a security failure
@@ -131,7 +130,9 @@ public abstract class Getdown extends Thread
*/ */
public void install () throws IOException, InterruptedException public void install () throws IOException, InterruptedException
{ {
if (_readyToInstall) { if (SysProps.noInstall()) {
log.info("Skipping install due to 'no_install' sysprop.");
} else if (_readyToInstall) {
log.info("Installing " + _toInstallResources.size() + " downloaded resources:"); log.info("Installing " + _toInstallResources.size() + " downloaded resources:");
for (Resource resource : _toInstallResources) { for (Resource resource : _toInstallResources) {
resource.install(); resource.install();
@@ -527,9 +528,7 @@ public abstract class Getdown extends Thread
// assuming we're not doing anything funny, install the update // assuming we're not doing anything funny, install the update
_readyToInstall = true; _readyToInstall = true;
if (!_noInstall) { install();
install();
}
// Only launch if we aren't in silent mode. Some mystery program starting out // Only launch if we aren't in silent mode. Some mystery program starting out
// of the blue would be disconcerting. // of the blue would be disconcerting.
@@ -1267,7 +1266,6 @@ public abstract class Getdown extends Thread
protected boolean _dead; protected boolean _dead;
protected boolean _silent; protected boolean _silent;
protected boolean _noInstall;
protected boolean _launchInSilent; protected boolean _launchInSilent;
protected long _startup; protected long _startup;