[Debian-live-changes] r1843 - in dists/trunk/live-webhelper: . scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-28 13:00:04 +0000 (Mon, 28 May 2007)
New Revision: 1843

Added:
   dists/trunk/live-webhelper/scripts/common
Modified:
   dists/trunk/live-webhelper/Makefile
   dists/trunk/live-webhelper/scripts/cgi
   dists/trunk/live-webhelper/scripts/cron
   dists/trunk/live-webhelper/scripts/default
Log:


Modified: dists/trunk/live-webhelper/Makefile
===================================================================
--- dists/trunk/live-webhelper/Makefile	2007-05-28 11:48:56 UTC (rev 1842)
+++ dists/trunk/live-webhelper/Makefile	2007-05-28 13:00:04 UTC (rev 1843)
@@ -16,6 +16,7 @@
 install: test
 	# Installing executables
 	install -D -m 0755 scripts/cgi $(DESTDIR)/usr/lib/cgi-bin/live-webhelper
+	install -D -m 0755 scripts/common $(DESTDIR)/usr/share/live-webhelper/common
 	install -D -m 0755 scripts/cron $(DESTDIR)/etc/cron.d/live-webhelper
 	install -D -m 0644 scripts/default $(DESTDIR)/etc/default/live-webhelper
 

Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi	2007-05-28 11:48:56 UTC (rev 1842)
+++ dists/trunk/live-webhelper/scripts/cgi	2007-05-28 13:00:04 UTC (rev 1843)
@@ -21,9 +21,8 @@
 # On Debian systems, the complete text of the GNU General Public License
 # can be found in /usr/share/common-licenses/GPL file.
 
-# Sending http header
-echo "Content-type: text/html"
-echo
+# Reading common
+. /usr/share/live-webhelper/common
 
 # Reading defaults
 if [ -r /etc/default/live-webhelper ]
@@ -34,6 +33,10 @@
         exit 1
 fi
 
+# Sending http header
+echo "Content-type: text/html"
+echo
+
 # Sending html header
 cat "${TEMPLATES}"/header.html
 

Added: dists/trunk/live-webhelper/scripts/common
===================================================================
--- dists/trunk/live-webhelper/scripts/common	                        (rev 0)
+++ dists/trunk/live-webhelper/scripts/common	2007-05-28 13:00:04 UTC (rev 1843)
@@ -0,0 +1 @@
+VERSION="1.0~a12"

Modified: dists/trunk/live-webhelper/scripts/cron
===================================================================
--- dists/trunk/live-webhelper/scripts/cron	2007-05-28 11:48:56 UTC (rev 1842)
+++ dists/trunk/live-webhelper/scripts/cron	2007-05-28 13:00:04 UTC (rev 1843)
@@ -8,6 +8,9 @@
 # This is free software, and you are welcome to redistribute it
 # under certain conditions; see COPYING for details.
 
+# Reading common
+. /usr/share/live-webhelper/common
+
 # Reading defaults
 if [ -r /etc/default/live-webhelper ]
 then
@@ -41,7 +44,7 @@
 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-webhelper: 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

Modified: dists/trunk/live-webhelper/scripts/default
===================================================================
--- dists/trunk/live-webhelper/scripts/default	2007-05-28 11:48:56 UTC (rev 1842)
+++ dists/trunk/live-webhelper/scripts/default	2007-05-28 13:00:04 UTC (rev 1843)
@@ -1,7 +1,5 @@
 # Defaults for /etc/cron.daily/live-webhelper
 
-VERSION="1.0~a12"
-
 WEBBUILD="disabled"
 
 DESTDIR="/srv/debian-unofficial/ftp/debian-live/webhelper"