Author: nextgens
Date: 2006-03-30 21:24:04 +0000 (Thu, 30 Mar 2006)
New Revision: 8374
Modified:
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/run.cmd
Log:
installer: more fixes
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-30 21:05:48 UTC (rev 8373)
+++ trunk/apps/installer/build.xml 2006-03-30 21:24:04 UTC (rev 8374)
@@ -104,6 +104,7 @@
<replacefilter token="@enableconsole@"
value="${Console}"/>
<replacefilter token="@fcpport@" value="${fcpport}"/>
<replacefilter token="@fproxyport@"
value="${fproxyport}"/>
+ <replacefilter token="@consoleport@"
value="${consoleport}"/>
</replace>
</target>
@@ -131,7 +132,7 @@
<target name="windows" if="is_windows">
<copy file="${basedir}/run.cmd"
tofile="${installDir}/run.cmd"/>
<replace file="${installDir}/run.cmd">
- <replacefilter token="@serviceName@"
value="freenedarknett-${freenetWorkingMode}"/>
+ <replacefilter token="@serviceName@"
value="freenet-${freenetWorkingMode}"/>
<replacefilter token="@fproxyport@"
value="${fproxyport}"/>
</replace>
<copy file="${basedir}/windows/start.cmd"
tofile="${installDir}/start.cmd"/>
@@ -139,7 +140,7 @@
<replacefilter token="@serviceName@"
value="freenet-${freenetWorkingMode}"/>
</replace>
<copy file="${basedir}/windows/stop.cmd"
tofile="${installDir}/stop.cmd"/>
- <replace file="${installDir}/start.cmd">
+ <replace file="${installDir}/stop.cmd">
<replacefilter token="@serviceName@"
value="freenet-${freenetWorkingMode}"/>
</replace>
<echo message="Creating shortcuts"/>
Modified: trunk/apps/installer/installclasspath/run.cmd
===================================================================
--- trunk/apps/installer/installclasspath/run.cmd 2006-03-30 21:05:48 UTC
(rev 8373)
+++ trunk/apps/installer/installclasspath/run.cmd 2006-03-30 21:24:04 UTC
(rev 8374)
@@ -5,4 +5,4 @@
@bin\wrapper -i ../wrapper.conf
@net start @serviceName@
@ping 127.0.0.1 -n 10 > NUL
-start http://localhost:@fproxyport@
+start http://localhost:@fproxyport@/
