Author: nextgens
Date: 2006-03-31 16:41:44 +0000 (Fri, 31 Mar 2006)
New Revision: 8401
Modified:
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/run.sh
Log:
installer: hopefully the node will startup now
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-31 16:25:29 UTC (rev 8400)
+++ trunk/apps/installer/build.xml 2006-03-31 16:41:44 UTC (rev 8401)
@@ -183,6 +183,7 @@
<copy file="${basedir}/linux/update.sh"
tofile="${installDir}/update.sh"/>
<chmod file="${installDir}/update.sh" perm="755"/>
+
<replace file="${installDir}/update.sh">
<replacefilter token="@path@" value="/${basedir}/"/>
</replace>
@@ -197,7 +198,7 @@
<echo message="Registering as a system service if possible"/>
- <exec executable="sh" dir="${installDir}">
+ <exec executable="sh" dir="${installDir}/">
<arg value="run.sh"/>
<arg value="start"/>
</exec>
Modified: trunk/apps/installer/installclasspath/run.sh
===================================================================
--- trunk/apps/installer/installclasspath/run.sh 2006-03-31 16:25:29 UTC
(rev 8400)
+++ trunk/apps/installer/installclasspath/run.sh 2006-03-31 16:41:44 UTC
(rev 8401)
@@ -15,8 +15,8 @@
APP_LONG_NAME="Freenet 0.7"
# Wrapper
-WRAPPER_CMD="bin/wrapper"
-WRAPPER_CONF="wrapper.conf"
+WRAPPER_CMD="./bin/wrapper"
+WRAPPER_CONF="./wrapper.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified.
@@ -118,7 +118,7 @@
# Process ID
ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
PIDFILE="$PIDDIR/$APP_NAME.pid"
-LOCKDIR="/var/lock/subsys"
+LOCKDIR="$REALDIR"
LOCKFILE="$LOCKDIR/$APP_NAME"
pid=""
