forked from I2P_Developers/i2p.i2p
* build.xml: Add a debian-source target
* Startup: Disable browser launch for debian daemon
This commit is contained in:
15
build.xml
15
build.xml
@@ -776,6 +776,7 @@
|
||||
<echo message="... and mtn cert t:i2p-${release.number} branch i2p.i2p.release" />
|
||||
</target>
|
||||
<target name="debian">
|
||||
<!-- binary only -->
|
||||
<echo message="Did you update the version in these files?" />
|
||||
<exec executable="ls" failonerror="true">
|
||||
<arg value="-l" />
|
||||
@@ -786,4 +787,18 @@
|
||||
<arg value="-b" />
|
||||
</exec>
|
||||
</target>
|
||||
<target name="debian-source">
|
||||
<!-- bundle the 20MB jetty 5 lib since there probably isn't a deb for it -->
|
||||
<ant dir="apps/jetty" target="verifyJettylib" />
|
||||
<echo message="Did you update the version in these files?" />
|
||||
<exec executable="ls" failonerror="true">
|
||||
<arg value="-l" />
|
||||
<arg value="debian/changelog" />
|
||||
</exec>
|
||||
<echo message="====================" />
|
||||
<exec executable="dpkg-buildpackage" failifexecutionfails="true" >
|
||||
<arg value="-S" />
|
||||
<arg value="-I_MTN" />
|
||||
</exec>
|
||||
</target>
|
||||
</project>
|
||||
|
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user