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

* Router: Support i2p.dir.base and i2p.dir.config passed in via properties

Browse Source
This commit is contained in:
zzz
2009-07-24 15:35:58 +00:00
parent 2f0b9a8f94
commit f6ec3f66f8
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/src/net/i2p/util/WorkingDir.java
View File

@ -52,8 +52,12 @@ public class WorkingDir {
* Only call this once on router invocation. * Only call this once on router invocation.
* Caller should store the return value for future reference. * Caller should store the return value for future reference.
*/ */
public static String getWorkingDir(boolean migrateOldConfig) { public static String getWorkingDir(Properties envProps, boolean migrateOldConfig) {
String dir = System.getProperty(PROP_WORKING_DIR); String dir = null;
if (envProps != null)
dir = envProps.getProperty(PROP_WORKING_DIR);
if (dir == null)
dir = System.getProperty(PROP_WORKING_DIR);
boolean isWindows = System.getProperty("os.name").startsWith("Win"); boolean isWindows = System.getProperty("os.name").startsWith("Win");
File dirf = null; File dirf = null;
if (dir != null) { if (dir != null) {
@ -69,10 +73,16 @@ public class WorkingDir {
dirf = new File(home, WORKING_DIR_DEFAULT); dirf = new File(home, WORKING_DIR_DEFAULT);
} }
} }
// where we are now // where we are now
String cwd = System.getProperty(PROP_BASE_DIR); String cwd = null;
if (envProps != null)
cwd = envProps.getProperty(PROP_BASE_DIR);
if (cwd == null) {
cwd = System.getProperty(PROP_BASE_DIR);
if (cwd == null) if (cwd == null)
cwd = System.getProperty("user.dir"); cwd = System.getProperty("user.dir");
}
// Check for a hosts.txt file, if it exists then I2P is there // Check for a hosts.txt file, if it exists then I2P is there
File oldDirf = new File(cwd); File oldDirf = new File(cwd);

2
router/java/src/net/i2p/router/Router.java
View File

@ -137,7 +137,7 @@ public class Router {
// Do we copy all the data files to the new directory? default false // Do we copy all the data files to the new directory? default false
String migrate = System.getProperty("i2p.dir.migrate"); String migrate = System.getProperty("i2p.dir.migrate");
boolean migrateFiles = Boolean.valueOf(migrate).booleanValue(); boolean migrateFiles = Boolean.valueOf(migrate).booleanValue();
String userDir = WorkingDir.getWorkingDir(migrateFiles); String userDir = WorkingDir.getWorkingDir(envProps, migrateFiles);
// Use the router.config file specified in the router.configLocation property // Use the router.config file specified in the router.configLocation property
// (default "router.config"), // (default "router.config"),