Author: nextgens
Date: 2006-03-30 17:24:30 +0000 (Thu, 30 Mar 2006)
New Revision: 8372
Modified:
trunk/apps/installer/build.xml
Log:
installer: new bugfixes
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-30 16:42:58 UTC (rev 8371)
+++ trunk/apps/installer/build.xml 2006-03-30 17:24:30 UTC (rev 8372)
@@ -43,8 +43,8 @@
<target name="config_default">
<echo message="Using default configuration"/>
- <condition property="NAME" value="${hostName}" else="NotSet">
- <isset property="${hostName}" />
+ <condition property="Name" else="${nodeName}" value="NotSet">
+ <equals arg1="${nodeName}" arg2="MyFirstFreenetNode" />
</condition>
<condition property="bandwidth" value="${bandwidth}" else="15">
<isset property="${bw}" />
@@ -120,8 +120,8 @@
<target name="windows" if="is_windows">
<copy file="${basedir}/run.cmd"
tofile="${installDir}/run.cmd"/>
<replace file="${installDir}/run.cmd">
- <replacefilter token="@Name@"
value="freenedarknett-${freenetWorkingMode}"/>
- <replacefilter token="@fproxyport@" value="${Port}"/>
+ <replacefilter token="@serviceName@"
value="freenedarknett-${freenetWorkingMode}"/>
+ <replacefilter token="@fproxyport@"
value="${fproxyport}"/>
</replace>
<copy file="${basedir}/windows/start.cmd"
tofile="${installDir}/start.cmd"/>
<replace file="${installDir}/start.cmd">
@@ -149,7 +149,7 @@
<copy file="${basedir}/run.sh" tofile="${installDir}/run.sh"/>
<chmod file="${installDir}/run.sh" perm="775"/>
<replace file="${installDir}/run.sh">
- <replacefilter token="@fproxyport@" value="${Port}"/>
+ <replacefilter token="@fproxyport@"
value="${fproxyport}"/>
</replace>
<echo message="Creating shortcuts"/>
@@ -157,7 +157,7 @@
<exec executable="sh" dir="${basedir}/linux/">
<arg value="CreateDesktopShortcut.sh"/>
<arg value=""${installDir}""/>
- <arg value="${Port}"/>
+ <arg value="${fproxyport}"/>
</exec>
<echo message="Registering as a system service if possible"/>
