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

* build.xml: Add a debian-source target

Browse Source 
* Startup: Disable browser launch for debian daemon
This commit is contained in:
zzz
2010-01-29 13:41:40 +00:00
parent cfeafacd07
commit 4186894a39
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ public class WorkingDir {
private final static String WORKING_DIR_DEFAULT_WINDOWS = "I2P";
private final static String WORKING_DIR_DEFAULT = ".i2p";
private final static String WORKING_DIR_DEFAULT_DAEMON = "i2p-config";
/** we do a couple of things differently if this is the username */
private final static String DAEMON_USER = "i2psvc";
/**
@@ -199,11 +200,15 @@ public class WorkingDir {
out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(newFile), "UTF-8")));
out.println("# Modified by I2P User dir migration script");
String s = null;
boolean isDaemon = DAEMON_USER.equals(System.getProperty("user.name"));
while ((s = DataHelper.readLine(in)) != null) {
if (s.endsWith("=\"eepsite/jetty.xml\"")) {
s = s.replace("=\"eepsite/jetty.xml\"", "=\"" + todir.getAbsolutePath() +
File.separatorChar + "eepsite" +
File.separatorChar + "jetty.xml\"");
} else if (isDaemon && s.equals("clientApp.4.startOnLoad=true")) {
// disable browser launch for daemon
s = "clientApp.4.startOnLoad=false";
}
out.println(s);
}