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

minor cleanup

Browse Source
This commit is contained in:
zab2
2013-04-29 17:55:27 +00:00
parent ebb2f1396b
commit 5375e425ac
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
router/java/src/net/i2p/router/startup/WorkingDir.java
View File

@ -71,6 +71,7 @@ public class WorkingDir {
dir = envProps.getProperty(PROP_WORKING_DIR); dir = envProps.getProperty(PROP_WORKING_DIR);
if (dir == null) if (dir == null)
dir = System.getProperty(PROP_WORKING_DIR); dir = System.getProperty(PROP_WORKING_DIR);
boolean isWindows = SystemVersion.isWindows(); boolean isWindows = SystemVersion.isWindows();
File dirf = null; File dirf = null;
if (dir != null) { if (dir != null) {
@ -84,11 +85,12 @@ public class WorkingDir {
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS); dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);
} else if (SystemVersion.isMac()) { } else if (SystemVersion.isMac()) {
String appdata = "/Library/Application Support/"; String appdata = "/Library/Application Support/";
if (new File(home,appdata).exists()&&false==(new File(home,WORKING_DIR_DEFAULT).exists())) { File old = new File(home,WORKING_DIR_DEFAULT);
if (old.exists() && old.isDirectory())
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT);
else {
home = home+appdata; home = home+appdata;
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_MAC); dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_MAC);
} else {
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT);
} }
} else { } else {
if (DAEMON_USER.equals(System.getProperty("user.name"))) if (DAEMON_USER.equals(System.getProperty("user.name")))