I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Build the process with processbuilder, check the I2P version when upgrading from NSIS in silent mode, check the RESTART_I2P environment variable when upgrading from NSIS in silent mode

Browse Source
This commit is contained in:
idk
2021-08-15 14:42:02 -04:00
parent 8737093b6d
commit 51aa9a97b1
4 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
java/net/i2p/router/WinUpdateProcess.java
View File

@ -11,17 +11,34 @@ class WinUpdateProcess implements Runnable {
private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(WinUpdateProcess.class);
private final RouterContext ctx;
private final Supplier<String> versionSupplier;
private final File file = null;
private final File file;
WinUpdateProcess(RouterContext ctx, Supplier<String> versionSupplier, File file) {
this.ctx = ctx;
this.versionSupplier = versionSupplier;
this.file = file;
}
private void runUpdateInstaller(File file){
ProcessBuilder pb = new ProcessBuilder("cmd", "/c", file.getAbsolutePath(), "/S");
String version = versionSupplier.get();
var workingDir = new File(ctx.getConfigDir(), "mac_updates");
var logFile = new File(workingDir, "log-" + version + ".txt");
ProcessBuilder pb = new ProcessBuilder(file.getAbsolutePath());
var env = pb.environment();
env.put("OLD_I2P_VERSION", version);
env.remove("RESTART_I2P");
int exitCode = ctx.router().scheduledGracefulExitCode();
if (exitCode == Router.EXIT_HARD_RESTART || exitCode == Router.EXIT_GRACEFUL_RESTART)
env.put("RESTART_I2P", "true");
try {
pb.start();
pb.directory(workingDir).
redirectErrorStream(true).
redirectOutput(logFile).
start();
} catch (IOException ex) {
if (_log.shouldWarn())
_log.warn("Unable to run update-program in background. Update will fail.");