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

Meeh's patch for trac ticket 729

Browse Source
This commit is contained in:
zab2
2013-04-29 16:54:36 +00:00
parent 3a4ac1fc4e
commit ebb2f1396b
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
installer/resources/i2prouter
View File

@@ -29,7 +29,15 @@
# should have been replaced by the izpack installer. # should have been replaced by the izpack installer.
# If you did not run the installer, replace them with the appropriate paths. # If you did not run the installer, replace them with the appropriate paths.
I2P="%INSTALL_PATH" I2P="%INSTALL_PATH"
I2P_CONFIG_DIR="%USER_HOME/.i2p" if [ "`uname -s`" == "Darwin" ]; then
if [ -d "%USER_HOME/Library/Application Support" ]; then
I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
else
I2P_CONFIG_DIR="%USER_HOME/.i2p"
fi
else
I2P_CONFIG_DIR="%USER_HOME/.i2p"
fi
I2PTEMP="%SYSTEM_java_io_tmpdir" I2PTEMP="%SYSTEM_java_io_tmpdir"
# PORTABLE installation: # PORTABLE installation:
# Use the following instead. # Use the following instead.

4
installer/resources/net.i2p.router.plist.template
View File

@@ -7,9 +7,9 @@
<key>OnDemand</key> <key>OnDemand</key>
<false/> <false/>
<key>StandardOutPath</key> <key>StandardOutPath</key>
<string>~/.i2p/wrapper.log</string> <string>~/Library/Application Support/i2p/wrapper.log</string>
<key>StandardErrorPath</key> <key>StandardErrorPath</key>
<string>~/.i2p/wrapper.log</string> <string>~/Library/Application Support/i2p/wrapper.log</string>
<key>ProgramArguments</key> <key>ProgramArguments</key>
<array> <array>
<string>COMMAND</string> <string>COMMAND</string>

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

@@ -49,6 +49,7 @@ public class WorkingDir {
private final static String PROP_BASE_DIR = "i2p.dir.base"; private final static String PROP_BASE_DIR = "i2p.dir.base";
private final static String PROP_WORKING_DIR = "i2p.dir.config"; private final static String PROP_WORKING_DIR = "i2p.dir.config";
private final static String WORKING_DIR_DEFAULT_WINDOWS = "I2P"; private final static String WORKING_DIR_DEFAULT_WINDOWS = "I2P";
private final static String WORKING_DIR_DEFAULT_MAC = "i2p";
private final static String WORKING_DIR_DEFAULT = ".i2p"; private final static String WORKING_DIR_DEFAULT = ".i2p";
private final static String WORKING_DIR_DEFAULT_DAEMON = "i2p-config"; private final static String WORKING_DIR_DEFAULT_DAEMON = "i2p-config";
/** we do a couple of things differently if this is the username */ /** we do a couple of things differently if this is the username */
@@ -81,6 +82,14 @@ public class WorkingDir {
if (appdata != null) if (appdata != null)
home = appdata; home = appdata;
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS); dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);
} else if (SystemVersion.isMac()) {
String appdata = "/Library/Application Support/";
if (new File(home,appdata).exists()&&false==(new File(home,WORKING_DIR_DEFAULT).exists())) {
home = home+appdata;
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")))
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_DAEMON); dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_DAEMON);