From: <bms...@us...> - 2007-10-20 13:59:58
|
Revision: 2571 http://morphix.svn.sourceforge.net/morphix/?rev=2571&view=rev Author: bmsleight Date: 2007-10-20 06:59:53 -0700 (Sat, 20 Oct 2007) Log Message: ----------- Work in progress Modified Paths: -------------- trunk/morphixlivekiosk/scripts/kabt.sh Modified: trunk/morphixlivekiosk/scripts/kabt.sh =================================================================== --- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-18 21:42:36 UTC (rev 2570) +++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-20 13:59:53 UTC (rev 2571) @@ -25,13 +25,14 @@ get_global_variables () { -TMP_DIR=/tmp/kabt.$$ +TMP_DIR=/tmp/kabt.$$.dir TMP_FILE=/tmp/kabt.$$.tmp -TMP_FILE_2=/tmp/kabt.$$.2.tmp +TMP_FILE_2=/tmp/kabt.$$.tmp.2 mkdir $TMP_DIR CACHED=~/.kabt/ SETUPXMLURL="http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml" SETUPXML="kiosk-builder-settings.xml" +MINIPRE="kioskmini.xml.pre" } clean_tmp () @@ -61,10 +62,10 @@ mkdir -p $CACHED/minimodules/ wget --tries=3 --timeout=60 -nv --directory-prefix=$CACHED $SETUPXMLURL xml_get "//kioskbuilder/morphix" "base" "base" $CACHED/$SETUPXML -wget --tries=3 --timeout=60 -nv --output-document=$CACHED/base $RETURN_VALUE +wget --tries=3 --timeout=60 -nv --output-document=$CACHED/base.iso $RETURN_VALUE xml_get "//kioskbuilder/morphix" "mainmodule" "mainmodule" $CACHED/$SETUPXML wget --tries=3 --timeout=60 -nv --output-document=$CACHED/mainmodule.mod $RETURN_VALUE -xml_get "//kioskbuilder/morphix" "kioskminipre" "kioskminipre" $CACHED/$SETUPXML +xml_get "//kioskbuilder/morphix" "kioskminipre" "kioskminipre" $CACHED/kioskmini.xml.pre wget --tries=3 --timeout=60 -nv --output-document=$CACHED/mainmodule.mod $RETURN_VALUE xml_get_tmp "//kioskbuilder/morphix" "minilist" "MiniModule" $CACHED/$SETUPXML RETURN_VALUE=$(cat $TMP_FILE) @@ -76,9 +77,89 @@ do morphmini $MINIS $MINIS.mod done +isomorph --add main $CACHED/mainmodule.mod $CACHED/base.iso $CACHED/2nd-stage.iso } +get_template_details () +{ +echo "Get Template Details" +xml_get "//kiosk" "brand" "brand" $TEMPLATE +BRAND="$RETURN_VALUE" +xml_get "//kiosk" "graphic" "graphic" $TEMPLATE +GRAPHIC="$RETURN_VALUE" +xml_get "//kiosk" "homepage" "homepage" $TEMPLATE +HOMEPAGE="$RETURN_VALUE" +xml_get "//kiosk" "navbar" "navbar" $TEMPLATE +NAVBAR="$RETURN_VALUE" +xml_get_tmp "//kiosk/network" "dhcp" "dhcp" $TEMPLATE +DHCP="$RETURN_VALUE" +xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE +EXTRAMINIS=$(cat $TMP_FILE) +} +build_kiosk_setting_mini () +{ +echo "Build Kiosk Setting (MiniModule)" +if [ "$NAVBAR" = "true" ]; then + echo "$NAVBAR" + ECOMMENT_OUT="" + COMMENT_OUT="" +else + echo "No NavBar" + ECOMMENT_OUT="-->" + COMMENT_OUT="\!--" +fi +cp $CACHED/$MINIPRE $TMP_DIR/ +sed -e s/ECOMMENTOUTNAVBAR/$ECOMMENTOUT/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 +if [ "$DHCP" = "true" ]; then + NETWORKCOMMANDS="<command>dhclient<\/command>" +else + NETWORKCOMMANDS="<\!--BlankNetworkSettings-->" +fi +sed -e s/NETWORKCOMMANDS/$NETWORKCOMMANDS/g $TMP_DIR/$MINIPRE >$TMP_FILE +mv $TMP_FILE $TMP_DIR/$MINIPRE +} + +put_kiosk_parts_together () +{ +echo "Putting Kiosk parts together." +for MINIS in $EXTRAMINIS +do + echo "Adding $MINI" + if [ -e "$CACHED/minimodules/$MINIS.mod" ]; + echo "Adding $MINIS" + else + echo "$MINI.mod is not stored in cache. Not added" + fi +done +} + +rebrand () +{ +echo "Rebrand" +} + +autotest () +{ +echo "AutoTest" +} + + +build_kiosk () +{ +echo +get_template_details +build_kiosk_setting_mini +put_kiosk_parts_together +rebrand +autotest +} + while getopts Snt:l:q:e: opt do case "$opt" in @@ -129,7 +210,11 @@ am_i_root_exit_if_not get_global_variables -clean_tmp if [ -n "$SETUP" ]; then set_up fi +if [ -n "$TEMPLATE" ]; then + build_kiosk +fi + +clean_tmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2007-10-21 13:44:25
|
Revision: 2572 http://morphix.svn.sourceforge.net/morphix/?rev=2572&view=rev Author: bmsleight Date: 2007-10-21 06:44:18 -0700 (Sun, 21 Oct 2007) Log Message: ----------- Work in progress Modified Paths: -------------- trunk/morphixlivekiosk/scripts/kabt.sh Modified: trunk/morphixlivekiosk/scripts/kabt.sh =================================================================== --- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-20 13:59:53 UTC (rev 2571) +++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-21 13:44:18 UTC (rev 2572) @@ -33,6 +33,8 @@ SETUPXMLURL="http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml" SETUPXML="kiosk-builder-settings.xml" MINIPRE="kioskmini.xml.pre" +DATE=$(date +"%F--%H-%M") + } clean_tmp () @@ -95,6 +97,7 @@ DHCP="$RETURN_VALUE" xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE EXTRAMINIS=$(cat $TMP_FILE) +OUTPUT="$LOCALDIR/$DATE_$BRAND" } build_kiosk_setting_mini () @@ -128,11 +131,14 @@ put_kiosk_parts_together () { echo "Putting Kiosk parts together." +cp $CACHED/2nd-stage.iso $TMP_DIR/output.iso for MINIS in $EXTRAMINIS do echo "Adding $MINI" - if [ -e "$CACHED/minimodules/$MINIS.mod" ]; + if [ -e "$CACHED/minimodules/$MINIS.mod" ]; then echo "Adding $MINIS" + isomorph --add mini $CACHED/minimodules/$MINIS.mod $TMP_DIR/output.iso $TMP_DIR/isomorph.iso + mv $TMP_DIR/isomorph.iso $TMP_DIR/output.iso else echo "$MINI.mod is not stored in cache. Not added" fi @@ -142,11 +148,35 @@ rebrand () { echo "Rebrand" +#http:// part=${string:0:5} +REMOTE=${GRAPHIC:0:7} +if [ "$REMOTE" = "http://" ]; then + echo "Remote Grpahic" + wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/$BRAND.png $GRAPHIC +else + echo "Local Graphic" + cp $GRAPHIC $TMP_DIR/$BRAND.png +fi +morphix-rebrand $TMP_DIR/output.iso $TMP_DIR/rebrand.iso $TMP_DIR/$BRAND.png +mv $TMP_DIR/rebrand.iso $TMP_DIR/output.iso } +save_iso () +{ +echo "Save" +mv "$TMP_DIR/output.iso" "$OUTPUT.iso" +#date +} + autotest () { echo "AutoTest" +#mv "$TMP_DIR/output.iso" "$OUTPUT.iso" +if [ "$NOTESTING" = "true" ]; then + echo "Not testing the built iso" +else + echo video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 600 -g 1024x768 -s "spc,spc,kp_enter" $OUTPUT.iso $OUTPUT.ogg +fi } @@ -157,6 +187,7 @@ build_kiosk_setting_mini put_kiosk_parts_together rebrand +save_iso autotest } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2007-10-21 23:03:29
|
Revision: 2573 http://morphix.svn.sourceforge.net/morphix/?rev=2573&view=rev Author: bmsleight Date: 2007-10-21 16:03:23 -0700 (Sun, 21 Oct 2007) Log Message: ----------- Work in progress Modified Paths: -------------- trunk/morphixlivekiosk/scripts/kabt.sh Modified: trunk/morphixlivekiosk/scripts/kabt.sh =================================================================== --- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-21 13:44:18 UTC (rev 2572) +++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-21 23:03:23 UTC (rev 2573) @@ -97,7 +97,7 @@ DHCP="$RETURN_VALUE" xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE EXTRAMINIS=$(cat $TMP_FILE) -OUTPUT="$LOCALDIR/$DATE_$BRAND" +OUTPUT="$LOCALDIR/${DATE}_$BRAND" } build_kiosk_setting_mini () @@ -179,19 +179,70 @@ fi } +write_buildlist () +{ +if [ "$NOTESTING" = "true" ]; then + ECHOBUILDLIST="$OUTPUT.iso" +else + ECHOBUILDLIST="$OUTPUT.iso $OUTPUT.ogg" +fi +if [ -n "$BUILDLIST" ]; then + echo "$ECHOBUILDLIST" >$BUILDLIST +fi +echo "$ECHOBUILDLIST" +} +get_head_of_queue () +{ +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 +} + +call_kabt () +{ +echo "Kabt calling kabt (recursive)" +if [ "$NOTESTING" = "true" ]; then + CALLTESTING="-n" +else + CALLTESTING="" +fi +$0 $CALLTESTING -b $TMP_DIR/build-list.txt -t $TMP_DIR/template.xml -l $LOCALDIR +} + +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 +} + + build_kiosk () { -echo get_template_details build_kiosk_setting_mini put_kiosk_parts_together rebrand save_iso autotest +write_buildlist } -while getopts Snt:l:q:e: opt +queue_build_kiosk () +{ +get_head_of_queue +call_kabt +call_webserver_with_links +} + +while getopts Snt:l:q:e:b: opt do case "$opt" in S) SETUP="true";; @@ -200,10 +251,11 @@ q) QUEUEURL="$OPTARG";; l) LOCALDIR="$OPTARG";; e) EXTERNALURL="$OPTARG";; + b) BUILDLIST="$OPTARG";; \?) # unknown flag echo >&2 " kabt -S /output/directory/" - echo >&2 " kabt [-n] -t template.xml -l /var/www/upload/" + echo >&2 " kabt [-n] [-b ./build-list.txt] -t template.xml -l /var/www/upload/" echo >&2 " kabt [-n] -q http://example.com/queue/ -l /var/www/upload/ -e www.foobar.com%2Fupload%2F" exit 1;; esac @@ -213,13 +265,14 @@ #Confirm parameters if [ -z "$SETUP$TEMPLATE$QUEUEURL" ]; then echo " kabt -S" - echo " kabt [-n] -t template.xml -l /var/www/upload/" + echo " kabt [-n] [-b ./build-list.txt] -t template.xml -l /var/www/upload/" echo " kabt [-n] -q http://example.com/queue/ -l /var/www/upload/ -e www.foobar.com%2Fupload%2F" echo echo " -S download all the parts and set-up kabt. " echo " -n Do not test the built kiosk LiveCD" echo " -t using the template build and test a Kiosk LiveCD" echo " -l The local location of the built videos and iso" + echo " -b Write the built file names to this file" echo " -q queue.txt Build the first template in the queue.txt" echo " The http://example.com/queue/ contains a plain txt of urls pointing a list of templates.xml " echo " -l The local location of the built videos and iso" @@ -247,5 +300,7 @@ if [ -n "$TEMPLATE" ]; then build_kiosk fi - +if [ -n "$QUEUEURL" ]; then + queue_build_kiosk +fi clean_tmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2007-10-23 22:43:47
|
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. |
From: <bms...@us...> - 2007-10-24 21:42:42
|
Revision: 2576 http://morphix.svn.sourceforge.net/morphix/?rev=2576&view=rev Author: bmsleight Date: 2007-10-24 14:42:40 -0700 (Wed, 24 Oct 2007) Log Message: ----------- kabt.sh working Modified Paths: -------------- trunk/morphixlivekiosk/scripts/kabt.sh Modified: trunk/morphixlivekiosk/scripts/kabt.sh =================================================================== --- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-23 22:45:16 UTC (rev 2575) +++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-24 21:42:40 UTC (rev 2576) @@ -93,7 +93,7 @@ HOMEPAGE="$RETURN_VALUE" xml_get "//kiosk" "navbar" "navbar" $TEMPLATE NAVBAR="$RETURN_VALUE" -xml_get_tmp "//kiosk/network" "dhcp" "dhcp" $TEMPLATE +xml_get "//kiosk/network" "dhcp" "dhcp" $TEMPLATE DHCP="$RETURN_VALUE" xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE EXTRAMINIS=$(cat $TMP_FILE) @@ -182,7 +182,7 @@ if [ "$NOTESTING" = "true" ]; then echo "Not testing the built iso" else - echo video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 600 -g 1024x768 -s "spc,spc,kp_enter" $OUTPUT.iso $OUTPUT.ogg + video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 800 -g 1024x768 -s "spc,spc,kp_enter" $OUTPUT.iso $OUTPUT.ogg fi } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2007-11-01 21:22:20
|
Revision: 2581 http://morphix.svn.sourceforge.net/morphix/?rev=2581&view=rev Author: bmsleight Date: 2007-11-01 14:22:01 -0700 (Thu, 01 Nov 2007) Log Message: ----------- Testing is good Modified Paths: -------------- trunk/morphixlivekiosk/scripts/kabt.sh Modified: trunk/morphixlivekiosk/scripts/kabt.sh =================================================================== --- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-31 00:16:32 UTC (rev 2580) +++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-11-01 21:22:01 UTC (rev 2581) @@ -117,11 +117,11 @@ 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 +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 +if [ "$DHCP" = "dhcp" ]; then NETWORKCOMMANDS="<command>dhclient<\/command>" else NETWORKCOMMANDS="<\!--BlankNetworkSettings-->" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |