[Debian-live-changes] r1628 - in dists/trunk/live-webbuilder: . templates

[rjent-guest at alioth.debian.org]

Author: rjent-guest
Date: 2007-05-23 04:02:36 +0000 (Wed, 23 May 2007)
New Revision: 1628

Modified:
   dists/trunk/live-webbuilder/Makefile
   dists/trunk/live-webbuilder/cron
   dists/trunk/live-webbuilder/defaults
   dists/trunk/live-webbuilder/live-webbuilder
   dists/trunk/live-webbuilder/templates/mail.txt
Log:
move some vars to /etc/default/live-webbuilder, change perms on install.

Modified: dists/trunk/live-webbuilder/Makefile
===================================================================
--- dists/trunk/live-webbuilder/Makefile	2007-05-22 22:58:38 UTC (rev 1627)
+++ dists/trunk/live-webbuilder/Makefile	2007-05-23 04:02:36 UTC (rev 1628)
@@ -11,7 +11,7 @@
 install: test
 	# Installing executables
 	install -D -m 0755 cron $(DESTDIR)/etc/cron.d/live-webbuilder
-	install -D -m 0755 defaults $(DESTDIR)/etc/default/live-webbuilder
+	install -D -m 0644 defaults $(DESTDIR)/etc/default/live-webbuilder
 	install -D -m 0755 live-webbuilder $(DESTDIR)/usr/lib/cgi-bin/live-webbuilder
 
 	# Installing templates
@@ -19,7 +19,7 @@
 	cp templates/*.html templates/*.txt $(DESTDIR)/usr/share/live-webbuilder/templates
 
 	# Installing documentation
-	install -D -m 0755 COPYING $(DESTDIR)/usr/share/doc/live-webbuilder/COPYING
+	install -D -m 0644 COPYING $(DESTDIR)/usr/share/doc/live-webbuilder/COPYING
 
 uninstall:
 	# Uninstalling executables
@@ -34,10 +34,12 @@
 	rm -rf $(DESTDIR)/usr/share/doc/live-webbuilder
 
 update:
-	sed -i -e 's/VERSION="0.2.7"/VERSION="0.2.x"/' live-webbuilder
+	@echo "Nothing to update."
 
 clean:
+	@echo "Nothing to clean."
 
 distclean:
+	@echo "Nothing to distclean."
 
 reinstall: uninstall install

Modified: dists/trunk/live-webbuilder/cron
===================================================================
--- dists/trunk/live-webbuilder/cron	2007-05-22 22:58:38 UTC (rev 1627)
+++ dists/trunk/live-webbuilder/cron	2007-05-23 04:02:36 UTC (rev 1628)
@@ -8,8 +8,6 @@
 # This is free software, and you are welcome to redistribute it
 # under certain conditions; see COPYING for details.
 
-TEMPLATES="/usr/share/live-webbuilder/templates"
-
 # Reading defaults
 if [ -r /etc/default/live-webbuilder ]
 then

Modified: dists/trunk/live-webbuilder/defaults
===================================================================
--- dists/trunk/live-webbuilder/defaults	2007-05-22 22:58:38 UTC (rev 1627)
+++ dists/trunk/live-webbuilder/defaults	2007-05-23 04:02:36 UTC (rev 1628)
@@ -1,8 +1,11 @@
 # Defaults for /etc/cron.daily/live-webbuilder
 
+VERSION="0.2.7"
+
 WEBBUILD="disabled"
 
 DESTDIR="/srv/debian-unofficial/ftp/debian-live/.live-webbuilder"
+TEMPLATES="/usr/share/live-webbuilder/templates"
 TEMPDIR="/srv/tmp/live-webbuilder"
 
 MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"

Modified: dists/trunk/live-webbuilder/live-webbuilder
===================================================================
--- dists/trunk/live-webbuilder/live-webbuilder	2007-05-22 22:58:38 UTC (rev 1627)
+++ dists/trunk/live-webbuilder/live-webbuilder	2007-05-23 04:02:36 UTC (rev 1628)
@@ -21,16 +21,19 @@
 # On Debian systems, the complete text of the GNU General Public License
 # can be found in /usr/share/common-licenses/GPL file.
 
-# Setting static variables
-VERSION="0.2.7"
-
-TEMPLATES="/usr/share/live-webbuilder/templates"
-TEMPDIR="/srv/tmp/live-webbuilder"
-
 # Sending http header
 echo "Content-type: text/html"
 echo
 
+# Reading defaults
+if [ -r /etc/default/live-webbuilder ]
+then
+        . /etc/default/live-webbuilder
+else
+        echo "E: /etc/default/live-webbuilder missing"
+        exit 1
+fi
+
 # Sending html header
 cat "${TEMPLATES}"/header.html
 
@@ -57,6 +60,7 @@
 	ISO_VOLUME="`echo ${QUERY_STRING} | grep -oE '(^|[?&])iso_volume=[0-9,a-z,A-Z,.,_,-,+]+' | sed 's/+/ /g' | cut -f 2 -d '=' | head -n1`"
 
 	# FIXME: filter invalid options
+	unset QUERY_STRING
 
 	# Getting build identifier
 	BUILD="`date +%Y%m%d.%s.%N`"

Modified: dists/trunk/live-webbuilder/templates/mail.txt
===================================================================
--- dists/trunk/live-webbuilder/templates/mail.txt	2007-05-22 22:58:38 UTC (rev 1627)
+++ dists/trunk/live-webbuilder/templates/mail.txt	2007-05-23 04:02:36 UTC (rev 1628)
@@ -4,19 +4,15 @@
 
 Hi,
 
-this is the automatic webbuilder of the Debian Live project
-<http://debian-live.alioth.debian.org/>.
+This is the automatic webbuilder of the Debian Live project <http://debian-live.alioth.debian.org/>.
 
-Your build with the ID BUILD has been started at:
-DATE_START
+Your build with the ID of BUILD started DATE_START and ended DATE_END with a status of STATUS.
 
-and ended at:
-DATE_END
+You can see the log file and download the images from <SERVER/BUILD/>.
 
-The build was STATUS.
+Have fun!
 
-You can see the log file and download the images from:
-<SERVER/BUILD/>
-
-Have fun,
-the Debian Live team
+--------------------------------------
+The Debian Live Team
+Debian Live - <http://live.debian.net/>
+-------------------------------------