echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge of '3acb036bb44bfe12916742877b1b2298ef6a156a'

Browse Source 
and '674ef573b3a8e4620f0e06397e062d86fc87a5a9'
This commit is contained in:
meeh
2018-04-10 15:23:41 +00:00
parent f00ac6ad14 7ae8381465
commit a474bd46d6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,7 +275,7 @@ public class Router implements RouterClock.ClockShiftListener {
String isPortableStr = System.getProperty("i2p.dir.portableMode");
boolean isPortable = Boolean.parseBoolean(isPortableStr);
String userDir = (!isPortable) ? WorkingDir.getWorkingDir(envProps, migrateFiles) : PortableWorkingDir.getWorkingDir(envProps, migrateFiles);
String userDir = (!isPortable) ? WorkingDir.getWorkingDir(envProps, migrateFiles) : PortableWorkingDir.getWorkingDir(envProps);
// Use the router.config file specified in the router.configLocation property
// (default "router.config"),

3
router/java/src/net/i2p/router/startup/PortableWorkingDir.java
View File

@@ -23,7 +23,7 @@ import java.util.Properties;
*
* Just FYI:
* In the context of a BB:
*
*
* On OSX it has to look 3 paths up, but for the other two, only one.
*
* OSX Path: I2PBrowser.app/Contents/MacOS/firefox
@@ -46,6 +46,7 @@ import java.util.Properties;
*
* @author (who to blame) Meeh
* @version 0.2
* @since 0.9.35
*/
public class PortableWorkingDir {