Updating filesystem pathes in cgi.

1 files changed, 11 insertions, 11 deletions

diff --git a/cgi/cron b/cgi/cron
index 9be288d..5d87cfe 100755
--- a/cgi/cron
+++ b/cgi/cron
@@ -11,11 +11,11 @@
 . "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
 
 # Reading defaults
-if [ -r /etc/default/live-webhelper ]
+if [ -r /etc/default/live-helper.cgi ]
 then
-	. /etc/default/live-webhelper
+	. /etc/default/live-helper.cgi
 else
-	echo "E: /etc/default/live-webhelper missing"
+	echo "E: /etc/default/live-helper.cgi missing"
 	exit 1
 fi
 
@@ -26,27 +26,27 @@ then
 fi
 
 # Checking lock file
-if [ -f /var/lock/live-webhelper.lock ]
+if [ -f /var/lock/live-helper.cgi.lock ]
 then
-	echo "E: live-webhelper already/still running."
+	echo "E: live-helper.cgi already/still running."
 	exit 1
 fi
 
 # Creating lock trap
-trap "test -f /var/lock/live-webhelper.lock && rm -f /var/lock/live-webhelper.lock; exit 0" 0 1 2 3 9 15
+trap "test -f /var/lock/live-helper.cgi.lock && rm -f /var/lock/live-helper.cgi.lock; exit 0" 0 1 2 3 9 15
 
 # Creating lock file
-touch /var/lock/live-webhelper.lock
+touch /var/lock/live-helper.cgi.lock
 
 # Cleanup old builds: cron should be run at least once per hour to take effect
 if ls "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* > /dev/null 2>&1
 then
 	rm -rf "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
 
-	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live
+	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper.cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live
 fi
 
-# Ok from here spin through the live-webhelper files we have waiting to build
+# Ok from here spin through the live-helper.cgi files we have waiting to build
 #if ls "${_TEMPDIR}"/*.build > /dev/null 2>&1
 if Find_files ${_TEMPDIR}/*.build 
 then
@@ -63,7 +63,7 @@ then
 		_CUSTOM_BINARY=`awk -F\" '/^_CUSTOM_BINARY=/{print $2}' ${_FILE}`
 		
 		# Drop out some build data for information if something goes wrong.
-		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: begin web build (${_BUILD})." >> /var/log/live
+		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper.cgi: begin web build (${_BUILD})." >> /var/log/live
 
 		# Creating build directory which also creates the config/chroot_sources folder
 		mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/chroot_sources
@@ -162,6 +162,6 @@ then
 		# Removing build directory
 		rm -rf "${_TEMPDIR}"/"${_BUILD}"
 
-		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live
+		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper.cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live
 	done
 fi