SF.net SVN: morphix: [2574] trunk/morphixlivekiosk/scripts/kabt.sh

Revision: 2574
          http://morphix.svn.sourceforge.net/morphix/?rev=2574&view=rev
Author:   bmsleight
Date:     2007-10-23 15:43:44 -0700 (Tue, 23 Oct 2007)

Log Message:
-----------
Ready for testing

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

Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh	2007-10-21 23:03:23 UTC (rev 2573)
+++ trunk/morphixlivekiosk/scripts/kabt.sh	2007-10-23 22:43:44 UTC (rev 2574)
@@ -110,15 +110,17 @@
 else
 	echo "No NavBar"
 	ECOMMENT_OUT="-->"
-	COMMENT_OUT="\!--"
+	COMMENT_OUT="<\!--"
 fi
 cp $CACHED/$MINIPRE  $TMP_DIR/
-sed -e s/ECOMMENTOUTNAVBAR/$ECOMMENTOUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
+sed -e s/ECOMMENTOUTNAVBAR/$ECOMMENT_OUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
 mv $TMP_FILE $TMP_DIR/$MINIPRE
 sed -e s/COMMENTOUTNAVBAR/$COMMENT_OUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
 mv $TMP_FILE $TMP_DIR/$MINIPRE
 sed -e s/HOMEPAGE/$HOMEPAGE/g $TMP_DIR/$MINIPRE >$TMP_FILE
 mv $TMP_FILE $TMP_DIR/$MINIPRE
+sed -e s/BRANDNAME/$BRAND/g $TMP_DIR/$MINIPRE >$TMP_FILE
+mv $TMP_FILE $TMP_DIR/$MINIPRE
 if [ "$DHCP" = "true" ]; then
 	NETWORKCOMMANDS="<command>dhclient<\/command>"
 else
@@ -126,6 +128,7 @@
 fi
 sed -e s/NETWORKCOMMANDS/$NETWORKCOMMANDS/g $TMP_DIR/$MINIPRE >$TMP_FILE
 mv $TMP_FILE $TMP_DIR/$MINIPRE
+morphmini $TMP_DIR/$MINIPRE $TMP_DIR/KioskSetting.mod
 }
 
 put_kiosk_parts_together ()
@@ -143,6 +146,10 @@
 		echo "$MINI.mod is not stored in cache. Not added"
 	fi
 done
+isomorph --add mini $TMP_DIR/KioskSetting.mod $TMP_DIR/output.iso $TMP_DIR/isomorph.iso
+mv $TMP_DIR/isomorph.iso $TMP_DIR/output.iso
+isomorph --add copy $TEMPLATE /morphix/  $TMP_DIR/output.iso $TMP_DIR/isomorph.iso
+mv $TMP_DIR/isomorph.iso $TMP_DIR/output.iso
 }
 
 rebrand ()
@@ -197,7 +204,10 @@
 echo "Get head of queue"
 wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/queue.txt $QUEUEURL
 HEADTEMPLATE=$(head -n 1 $TMP_DIR/queue.txt)
-wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/template.xml $HEADTEMPLATE
+ISHTTP=${HEADTEMPLATE:0:7} 
+if [ "$ISHTTP" = "http://" ]; then
+	wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/template.xml $HEADTEMPLATE
+fi
 }
 
 call_kabt ()
@@ -208,19 +218,25 @@
 else
 	CALLTESTING=""
 fi
-$0 $CALLTESTING -b $TMP_DIR/build-list.txt -t $TMP_DIR/template.xml -l $LOCALDIR
+if [ -e $TMP_DIR/template.xml ]; then
+	$0 $CALLTESTING -b $TMP_DIR/build-list.txt -t $TMP_DIR/template.xml -l $LOCALDIR
+else
+	echo "Queue empty"
+fi
 }
 
 call_webserver_with_links ()
 {
-echo "Call Webserver with links"
-CALLWL="${EXTERNALURL}"
-CALLWLISO=$(cut -d\  -f1 $TMP_DIR/build-list.txt)
-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
+if [ -e $TMP_DIR/template.xml ]; then
+	echo "Call Webserver with links"
+	CALLWL="${EXTERNALURL}"
+	CALLWLISO=$(cut -d\  -f1 $TMP_DIR/build-list.txt)
+	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
+fi
 }
 
 


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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/