SF.net SVN: morphix: [2392] trunk/morph-scripts/mmorphix

[email protected] Sat, 19 Aug 2006 13:53:15 -0700
Newsgroups gmane.linux.morphix.cvs
Message-ID <[email protected]>
Revision: 2392
Author:   bmsleight
Date:     2006-08-19 13:53:06 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2392&view=rev

Log Message:
-----------
Moving along

Modified Paths:
--------------
    trunk/morph-scripts/mmorphix/MorphixMini-Launch-MM-GUI.xml
    trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
Modified: trunk/morph-scripts/mmorphix/MorphixMini-Launch-MM-GUI.xml
===================================================================
--- trunk/morph-scripts/mmorphix/MorphixMini-Launch-MM-GUI.xml	2006-08-19 08:35:30 UTC (rev 2391)
+++ trunk/morph-scripts/mmorphix/MorphixMini-Launch-MM-GUI.xml	2006-08-19 20:53:06 UTC (rev 2392)
@@ -6,6 +6,14 @@
    <minitag>MorphixMini-Launch-MM-GUI</minitag>
    <maintag>ALL</maintag>	
    <bootoption>ALL</bootoption> 
+   <root> <!-- Files or Packages to be overlaid on the rootfile system - good for saving ramspace -->
+    <files>
+     <remote>
+      <from>http://svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh</from>
+      <to>/usr/sbin/</to>
+     </remote>
+    </files>
+   </root>     
    <commandlist> <!-- Commands to be started from minimodule --> 
     <X>         <!-- Commands to run in X windows -->
      <command>/usr/sbin/morphing-morphix-gui &amp; </command><!-- &amp; is xml format for & -->

Modified: trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
===================================================================
--- trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh	2006-08-19 08:35:30 UTC (rev 2391)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh	2006-08-19 20:53:06 UTC (rev 2392)
@@ -136,16 +136,27 @@
 MESSAGE_TITLE="Morphing Morphix"
 MESSAGE_EXIT="Are you sure you wish to exit Morphing Morphix now ?"
 MESSAGE_MAIN_MENU="Select one of the example Morphs to do "
-MESSAGE_MAIN_MENU_1="Configure Morphing-Morphix"
+MESSAGE_MAIN_MENU_1="Submenu [Configure Morphing-Morphix]"
 MESSAGE_MAIN_MENU_2="Introduction to isomorph"
 MESSAGE_MAIN_MENU_3="Using isomorph to get a clean base"
-MESSAGE_MAIN_MENU_4="Using an XML template to build a MiniModule"
-MESSAGE_MAIN_MENU_5="Morphing the Home Directory "
-MESSAGE_MAIN_MENU_6="Using an XML template to build a mainmodule"
-MESSAGE_MAIN_MENU_7="Step inside the MainModule - changing by hand"
-MESSAGE_MAIN_MENU_8="Rebranding an ISO"
-MESSAGE_MAIN_MENU_9="Building a whole ISO from Scratch"
-MESSAGE_MAIN_MENU_10="Testing an iso using qemu"
+MESSAGE_MAIN_MENU_4="Submenu [MiniModules]"
+MESSAGE_MAIN_MENU_5="Submenu [MainModules]"
+MESSAGE_MAIN_MENU_6="Rebranding an ISO"
+MESSAGE_MAIN_MENU_7="Building a whole ISO from Scratch"
+MESSAGE_MAIN_MENU_8="Testing an iso using qemu"
+MESSAGE_MAIN_MENU_9="Open a terminal for Morphing"
+MESSAGE_MAIN_MENU_RETURN="Return to Main Menu"
+MESSAGE_CONFIGURE_MENU="$MESSAGE_MAIN_MENU_1"
+MESSAGE_CONFIGURE_MENU_1="Main Configuration"
+MESSAGE_CONFIGURE_MENU_2="Remove CD Images already made"
+MESSAGE_MINIMODS_MENU="$MESSAGE_MAIN_MENU_4"
+MESSAGE_MINIMODS_MENU_1="Using an XML template to build a MiniModule"
+MESSAGE_MINIMODS_MENU_2="Saving the Home Directory toa MiniModule "
+MESSAGE_MAINMODS_MENU="MESSAGE_MAIN_MENU_5"
+MESSAGE_MAINMODS_MENU_1="Using an XML template to build a mainmodule"
+MESSAGE_MAINMODS_MENU_2="Step inside the MainModule - changing by hand"
+
+###########################################################
 MESSAGE_SETTING_USE="Setting up Morphing Morphix
 
 Previous setting detected.
@@ -403,8 +414,8 @@
 	 -p grub-gfxboot-iso-udeb 
 	 -p morphix-cdrom-misc-udeb 
 	 -p morphix-grub-menulist-udeb 
-	 -p morphix-iso-grubtheme ./morphix-livekiosk.iso
-morphix-rebrand ./morphix-livekiosk.iso 
+	 -p morphix-iso-grubtheme /tmp/tmp.iso
+morphix-rebrand /tmp/tmp.iso 
 	./MorphixLiveKiosk.iso 
 	./MorphixLiveKiosk.png
 
@@ -639,7 +650,7 @@
 	case $? in
 	  1)
 	    log_file "main_menu selected $?"
-	    set_up_mmorphix;;
+	    configure_mm_submenu;;
 	  2)
 	    log_file "main_menu selected $?"
 	    isomorph_intro;;
@@ -648,30 +659,81 @@
 	    remove_main_and_minis;;
 	  4)
 	    log_file "main_menu selected $?"
-	    build_minimodule;;
+	    minimodules_submenu;;
 	  5)
 	    log_file "main_menu selected $?"
-	    make_mini;;
+	    mainmodules_submenu;;
 	  6)
 	    log_file "main_menu selected $?"
-	    build_mainmodule;;
+	    rebrand_iso;;
 	  7)
 	    log_file "main_menu selected $?"
-	    inside_mainmodule;;
+	    autobuild_whole_iso;;
 	  8)
 	    log_file "main_menu selected $?"
-	    rebrand_iso;;
+	    test_qemu;;
 	  9)
 	    log_file "main_menu selected $?"
-	    autobuild_whole_iso;;
-  	  10)
-	    log_file "main_menu selected $?"
-	    test_qemu;;
+	    echo;;
 	  255)
 	     closing_mmorphix "main_menu";;
 	esac
 }
 
+configure_mm_submenu ()
+{
+xdialog_menu "$MESSAGE_CONFIGURE_MENU" \
+	     '$MESSAGE_CONFIGURE_MENU_1' '$MESSAGE_CONFIGURE_MENU_2'\
+	     '$MESSAGE_MAIN_MENU_RETURN'
+	case $? in
+	1)
+	   set_up_mmorphix;;
+	2)
+	   echo;;
+	3) 
+	   main_menu;;
+	255)
+	   closing_mmorphix "configure_mm_submenu";;
+	esac	
+}
+
+minimodules_submenu ()
+{
+xdialog_menu "$MESSAGE_MINIMODS_MENU" \
+	     '$MESSAGE_MINIMODS_MENU_1' '$MESSAGE_MINIMODS_MENU_2'\
+	     '$MESSAGE_MAIN_MENU_RETURN'
+	case $? in
+	1)
+	   build_minimodule;;
+	2)
+	   make_mini;;
+	3) 
+	   main_menu;;
+	255)
+	   closing_mmorphix "configure_mm_submenu";;
+	esac	
+}
+
+mainmodules_submenu ()
+{
+xdialog_menu "$MESSAGE_MAINMODS_MENU" \
+	     '$MESSAGE_MAINMODS_MENU_1' '$MESSAGE_MAINMODS_MENU_2'\
+	     '$MESSAGE_MAIN_MENU_RETURN'
+	case $? in
+	1)
+	   build_mainmodule;;
+	2)
+	   inside_mainmodule;;
+	3) 
+	   main_menu;;
+	255)
+	   closing_mmorphix "configure_mm_submenu";;
+	esac	
+}
+
+
+
+
 ###########################################################
 #                                                         #
 #               BELOW IS THE MORPHING FUN                 #
@@ -988,10 +1050,49 @@
 	#MESSAGE_WHOLEISO_1 2 4 y/n
 	xdialog_message "$MESSAGE_WHOLEISO"
 	xdialog_message "$MESSAGE_WHOLEISO_1"
+	log_and_do_command_progress "wget http://svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/mmaker/templates/basemod-2.6.9.xml 
+		-O /tmp/basemod-2.6.9.xml"
+	log_and_do_command_progress "wget http://svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/mmaker/templates/morphix-livekiosk.xml 
+		-O /tmp/morphix-livekiosk.xml"
+	log_and_do_command_progress "wget http://svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-KioskSetting.xml 
+		-O /tmp/MorphixMini-KioskSetting.xml"
+	log_and_do_command_progress "wget http://svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/how_tos/images/MorphixLiveKiosk.png 
+		-O /tmp/MorphixLiveKiosk.png"
+	NON_GNU=""
 	xdialog_yes_no  "$MESSAGE_WHOLEISO_2"
-	xdialog_message "$MESSAGE_WHOLEISO_3"
+		case $? in
+		0)
+		log_file "Non GNU ok"
+		xdialog_message "$MESSAGE_WHOLEISO_3"
+		log_and_do_command_progress "wget http://svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-KioskSetting.xml 
+						-O /tmp/MorphixMini-KioskSetting.xml"
+		NON_GNU=" -n /tmp/MorphixMini-KioskAddins.xml ";;
+		1)
+		log_file "GNU Only";;
+		255)
+		closing_mmorphix "morphing_main_module";;
+	esac
 	xdialog_yes_no  "$MESSAGE_WHOLEISO_4"
-
+		case $? in
+		0)
+		log_file "Building whole ISO"
+		log_and_do_command_progress "sudo isomaker -b /tmp/basemod-2.6.15.xml -m /tmp/morphix-livekiosk.xml
+						-n /tmp/MorphixMini-KioskSetting.xml 
+						$NON_GNU 
+						-r http://www.morphix.org/debian 
+						-p grub-gfxboot-iso-udeb 
+						-p morphix-cdrom-misc-udeb 
+						-p morphix-grub-menulist-udeb 
+						-p morphix-iso-grubtheme 
+						/tmp/tmp.iso"
+		log_and_do_command_progress "sudo morphix-rebrand /tmp/tmp.iso 
+						$MNT_POINT/mmorphix/iso/MorphixLiveKiosk.iso 
+						/tmp/MorphixLiveKiosk.png";;
+		1)
+		log_file "Skip building whole ISO";;
+		255)
+		closing_mmorphix "morphing_main_module";;
+	esac
  fi
  main_menu
 }


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


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642