--- ./scripts/CrashPlanEngine	2014-02-19 23:17:19.000000000 +0000
+++ ./scripts/CrashPlanEngine.1	2014-07-24 17:36:37.330333581 +0100
@@ -11,7 +11,7 @@
 	
 	cd $TARGETDIR
 		
-	nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log & 
+	nice -n 19 $JAVACOMMON $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log & 
 	
 	if [[ $! -gt 0 ]]; then
 		echo $! > $PIDFILE
@@ -26,7 +26,7 @@
 
 	echo "Using Ubuntu 9.04 startup"
 	
-	start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $TARGETDIR/log/engine_output.log 2> $TARGETDIR/log/engine_error.log
+	start-stop-daemon -v --pidfile $PIDFILE --make-pidfile --background --chdir $TARGETDIR --start --nicelevel 19 --exec $JAVACOMMON -- $SRV_JAVA_OPTS -classpath $FULL_CP com.backup42.service.CPService > $VARDIR/log/engine_output.log 2> $VARDIR/log/engine_error.log
 	
 	# This test isn't as useful as one might like; start-stop-daemon can't accurately report the state of child processes when --background is used.
 	# We use this mainly to report the specific error value returned by start-stop-daemon if something goes wrong, but be aware that a return value
@@ -91,7 +91,6 @@
 DESC="CrashPlan Engine"
 NAME=CrashPlanEngine
 DAEMON=$TARGETDIR/lib/com.backup42.desktop.jar
-PIDFILE="$TARGETDIR/${NAME}.pid"
 
 if [[ -f $TARGETDIR/install.vars ]]; then
 	. $TARGETDIR/install.vars
@@ -100,6 +99,8 @@
 	exit 1
 fi
 
+PIDFILE="$VARDIR/${NAME}.pid"
+
 if [[ ! -f $DAEMON ]]; then
 	echo "Could not find JAR file $DAEMON"
 	exit 0