[Morphix-cvs] SF.net SVN: morphix: [2578] trunk/morphixlivekiosk/scripts

[<bms...@us...>]

Revision: 2578
          http://morphix.svn.sourceforge.net/morphix/?rev=2578&view=rev
Author:   bmsleight
Date:     2007-10-30 16:44:27 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
Any testers ?

Modified Paths:
--------------
    trunk/morphixlivekiosk/scripts/index.pl
    trunk/morphixlivekiosk/scripts/kabt.sh

Modified: trunk/morphixlivekiosk/scripts/index.pl
===================================================================
--- trunk/morphixlivekiosk/scripts/index.pl	2007-10-30 22:19:33 UTC (rev 2577)
+++ trunk/morphixlivekiosk/scripts/index.pl	2007-10-30 23:44:27 UTC (rev 2578)
@@ -20,22 +20,7 @@
   close(OUT);
 }
 
-
-if (param("queue"))	{
-	print "Content-type: text/html\n\n";	
-	
-	open(DAT, $templatequeue) || die("Could not open file!");
-	@raw_data=<DAT>;
-	close(DAT);
-	
-	foreach $queue (@raw_data)
-	{
-	chop($queue);
-	 ($urls,$emails)=split(/\|/,$queue);
-	print "$urls\n";
-	}
-}
-elsif (param("built"))	{
+if (param("built"))	{
 	print header, start_html("Custom Built Kiosk LiveCD"), h1("Custom Built Kiosk LiveCD");	
 	$built = param("built");
 	$video = param("v");
@@ -43,11 +28,11 @@
 	print p("$built/$video \n");
 	print p("$built/$iso \n");
 	$message = 	  "Your custom built Kiosk LiveCD is ready. \n"
-				. "Please download and view the AutoTesting video first. \n "
+				. "Please download and view the AutoTesting video first. \n"
 				. "The video will show how successful the build was and can save "
 				. "vital bandwidth if the build did not go well. \n\n"
-				. "Video - http://$built/$video \n"
-				. "ISO - http://$built/$iso \n"
+				. "Video - $built/$video \n"
+				. "ISO   - $built/$iso \n"
 				. "\n"
 				. "Enjoy Your Kiosk - kiosk.liveCD.org";
 	open(DAT, $templatequeue) || die("Could not open file!");
@@ -64,6 +49,20 @@
 	system "echo \"$message\" | mail -s 'Custom Built Kiosk LiveCD' $emails -- -r bu...@li... -";
 	system "cat  $templatequeue  | tail -n+2 >$templatequeue ";
 }
+elsif (param("queue"))	{
+	print "Content-type: text/html\n\n";	
+	
+	open(DAT, $templatequeue) || die("Could not open file!");
+	@raw_data=<DAT>;
+	close(DAT);
+	
+	foreach $queue (@raw_data)
+	{
+	chop($queue);
+	 ($urls,$emails)=split(/\|/,$queue);
+	print "$urls\n";
+	}
+}
 else {
 #
 # Start by printing the content-type, the title of the web page and a heading.
@@ -169,15 +168,16 @@
 		print p("Templates successfully created : <a href='$templateurl" . ">" . "$brand" . "</a>");
 		print start_form();			
 		print p("Template will be added to the queue to be built.");
-		print p("Once built, we will email the links contain the AutoTest Video and the iso to download");
+		print p("Once built, we will email the links containing the AutoTest Video and the iso to download");
 		print p("Email Address: ", textfield(-name=>"email", -size=>30),  hidden(-name=>'url', -default=> $templateurl ) );
 		print p(submit("Build!"));
+		print p("Builds are run from the queue of builds at 1500, 1800 and 2100 GMT daily");
 		print end_form();
 		}
 	else	{  					# Else, first time through so present form.
 		print start_form();			
 		print p("What is the Brand Name (e.g. MorphixLiveKiosk) ? ", textfield("brand"));
-		print p("Graphics file used from logo and backgrounds ? ", filefield(-name=>'graphic',
+		print p("Graphics file used for logo and backgrounds ? ", filefield(-name=>'graphic',
 																-size=>30,
 																-maxlength=>80));
 		print p("What is the Homepage URL (e.g. www.morphix.org) ? ", textfield("homepage"));

Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh	2007-10-30 22:19:33 UTC (rev 2577)
+++ trunk/morphixlivekiosk/scripts/kabt.sh	2007-10-30 23:44:27 UTC (rev 2578)
@@ -234,8 +234,8 @@
 	CALLWLOGG=$(cut -d\  -f2 $TMP_DIR/build-list.txt)
 	CALLWLISOBN=$(basename $CALLWLISO)
 	CALLWLOGGBN=$(basename $CALLWLOGG)
-	CALLWL="${EXTERNALURL}&b=${CALLWLISOBN}&v=${CALLWLOGGBN}"
-	echo wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
+	CALLWL="${QUEUEURL}&built=${EXTERNALURL}&v=${CALLWLOGGBN}&i=${CALLWLISOBN}"
+	wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
 fi
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.