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

Don't use a static global UPP

Browse Source
This commit is contained in:
idk
2022-02-11 01:34:58 -05:00
parent 565ac41168
commit 8200d65eb5
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/net/i2p/router/WinLauncher.java
View File

@@ -26,10 +26,11 @@ import static net.i2p.update.UpdateType.*;
* router.pid - the pid of the java process. * router.pid - the pid of the java process.
*/ */
public class WinLauncher { public class WinLauncher {
private static WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(); // private static WindowsUpdatePostProcessor wupp = new
// WindowsUpdatePostProcessor();
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
File programs = wupp.selectProgramFile(); File programs = selectProgramFile();
if (!programs.exists()) if (!programs.exists())
programs.mkdirs(); programs.mkdirs();
else if (!programs.isDirectory()) { else if (!programs.isDirectory()) {
@@ -51,7 +52,7 @@ public class WinLauncher {
System.out.println("\t" + System.getProperty("i2p.dir.base") + "\n\t" + System.getProperty("i2p.dir.config") System.out.println("\t" + System.getProperty("i2p.dir.base") + "\n\t" + System.getProperty("i2p.dir.config")
+ "\n\t" + System.getProperty("router.pid")); + "\n\t" + System.getProperty("router.pid"));
wupp.i2pRouter = new Router(System.getProperties()); // wupp.i2pRouter = new Router(System.getProperties());
System.out.println("Router is configured"); System.out.println("Router is configured");
Thread registrationThread = new Thread(REGISTER_UPP); Thread registrationThread = new Thread(REGISTER_UPP);
@@ -59,7 +60,8 @@ public class WinLauncher {
registrationThread.setDaemon(true); registrationThread.setDaemon(true);
registrationThread.start(); registrationThread.start();
wupp.i2pRouter.runRouter(); // wupp.i2pRouter.runRouter();
RouterLaunch.main(args);
} }
private static final Runnable REGISTER_UPP = () -> { private static final Runnable REGISTER_UPP = () -> {
@@ -77,7 +79,7 @@ public class WinLauncher {
sleep(1000); sleep(1000);
} }
wupp = new WindowsUpdatePostProcessor(ctx); WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE); um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE); um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
}; };
@@ -108,4 +110,17 @@ public class WinLauncher {
} }
} }
private static File selectProgramFile() {
if (SystemVersion.isWindows()) {
File jrehome = new File(System.getProperty("java.home"));
File programs = jrehome.getParentFile();
System.out.println("Windows portable jpackage wrapper found, using: " + programs + " as working config");
return programs.getAbsoluteFile();
} else {
File jrehome = new File(System.getProperty("java.home"));
File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
System.out.println("Linux portable jpackage wrapper found, using: " + programs + " as working config");
return programs.getAbsoluteFile();
}
}
} }

14
java/net/i2p/router/WindowsUpdatePostProcessor.java
View File

@@ -103,18 +103,4 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
return null; return null;
} }
protected File selectProgramFile() {
if (SystemVersion.isWindows()) {
File jrehome = new File(System.getProperty("java.home"));
File programs = jrehome.getParentFile();
System.out.println("Windows portable jpackage wrapper found, using: " + programs + " as working config");
return programs.getAbsoluteFile();
} else {
File jrehome = new File(System.getProperty("java.home"));
File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
System.out.println("Linux portable jpackage wrapper found, using: " + programs + " as working config");
return programs.getAbsoluteFile();
}
}
} }