SF.net SVN: morphix: [2396] trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
[email protected] Tue, 22 Aug 2006 15:19:17 -0700
| Newsgroups | gmane.linux.morphix.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2396
Author: bmsleight
Date: 2006-08-22 15:19:06 -0700 (Tue, 22 Aug 2006)
ViewCVS: http://svn.sourceforge.net/morphix/?rev=2396&view=rev
Log Message:
-----------
moving along
Modified Paths:
--------------
trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
Modified: trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh
===================================================================
--- trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2006-08-20 22:29:22 UTC (rev 2395)
+++ trunk/morph-scripts/mmorphix/morphing-morphix-gui.sh 2006-08-22 22:19:06 UTC (rev 2396)
@@ -105,6 +105,20 @@
xterm -T "Morphing-Morphix in progress ..." -e $TMP_SCRIPT
}
+log_and_do_command_progress_pause ()
+{
+ TMP_DO=""
+ PROMPT_E="morphingmorphix@MorphingMorphix:~$"
+ for TMP_COMMANDS in $*
+ do
+ TMP_DO="$TMP_DO $TMP_COMMANDS"
+ done
+ echo $TMP_DO >>$SETTING_LOG_COMMANDS
+ echo "echo \"$PROMPT_E $TMP_DO\";" $TMP_DO "; echo \"$PROMPT_E \"; echo ;read -p \"Press enter to continue ... \" ">$TMP_SCRIPT
+ xterm -T "Morphing-Morphix in progress ..." -e $TMP_SCRIPT
+}
+
+
log_and_do_not_do_command ()
{
TMP_DO=""
@@ -126,6 +140,16 @@
}
+edit_xml_template ()
+{
+ TMP_DO=""
+ for TMP_TEMPLATES in $*
+ do
+ TMP_DO="$TMP_DO $TMP_TEMPLATES"
+ done
+scite $TMP_DO
+}
+
###########################################################
# #
# SECTION 2 : MESSAGES #
@@ -850,9 +874,7 @@
log_file "isomorph_intro"
#$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH
xdialog_message "$MESSAGE_ISOMORPH"
- log_and_do_command_progress "echo \"morphingmorphix@MorphingMorphix:~$ isomorph --list ./$SETTING_MYMORPH\" ;
- sudo isomorph --list $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH ;
- read -p \"Press enter to continue ... \""
+ log_and_do_command_progress_pause "sudo isomorph --list $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH "
fi
main_menu
}
@@ -875,10 +897,10 @@
# MESSAGE_REMOVE_MODS
xdialog_message "$MESSAGE_REMOVE_MODS"
xdialog_message "$MESSAGE_REMOVE_MODS_1"
- log_and_do_command_progress "sudo isomorph --del-all main
+ log_and_do_command_progress_pause "sudo isomorph --del-all main
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
- log_and_do_command_progress "sudo isomorph --del-all mini
+ log_and_do_command_progress_pause "sudo isomorph --del-all mini
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
xdialog_message "$MESSAGE_REMOVE_MODS_2"
@@ -904,14 +926,14 @@
log_file "build_minimodule"
xdialog_message "$MESSAGE_MINIMORPH_1"
xdialog_tail_box "$MESSAGE_MINIMORPH_2" "/usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml"
+ edit_xml_template "/usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml"
xdialog_message "$MESSAGE_MINIMORPH_3"
- log_and_do_command_progress "sudo morphmini /usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml
+ log_and_do_command_progress_pause "sudo morphmini /usr/share/morphing-morphix/MorphixMini-Launch-MM-GUI.xml
/tmp/MorphixMini-Launch-MM-GUI.mod"
- log_and_do_command_progress "sudo isomorph --add mini
+ log_and_do_command_progress_pause "sudo isomorph --add mini
/tmp/MorphixMini-Launch-MM-GUI.mod
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
- xdialog_message "$MESSAGE_MINIMORPH_3"
fi
main_menu
}
@@ -933,9 +955,9 @@
xdialog_message "$MESSAGE_MAKE_MINI"
xdialog_message "$MESSAGE_MAKE_MINI_1"
xdialog_message "$MESSAGE_MAKE_MINI_2"
- log_and_do_command_progress "sudo make-mini --homedir --hidden
+ log_and_do_command_progress_pause "sudo make-mini --homedir --hidden
/tmp/MorphixMini-MM-Saved-Home.mod "
- log_and_do_command_progress "sudo isomorph --add mini
+ log_and_do_command_progress_pause "sudo isomorph --add mini
/tmp/MorphixMini-MM-Saved-Home.mod
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
@@ -963,10 +985,10 @@
xdialog_yes_no "$MESSAGE_MMAKER_2"
case $? in
0)
- log_and_do_command_progress "sudo mmaker
+ log_and_do_command_progress_pause "sudo mmaker
/usr/share/morphing-morphix/morphing-morphix.xml
/tmp/$SETTING_MYMORPH_MAIN"
- log_and_do_command_progress "sudo isomorph --add main
+ log_and_do_command_progress_pause "sudo isomorph --add main
/tmp/morphing-morphix.mod
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
@@ -1001,12 +1023,12 @@
case $? in
0)
log_file "Do not skip extracting"
- log_and_do_command_progress "sudo isomorph --get main
+ log_and_do_command_progress_pause "sudo isomorph --get main
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH
$MNT_POINT/mmorphix/morphed/"
- log_and_do_command_progress "sudo morphix-chroot
+ log_and_do_command_progress_pause "sudo morphix-chroot
$MNT_POINT/mmorphix/morphed/$SETTING_MYMORPH_MAIN "
- log_and_do_command_progress "sudo isomorph --add main
+ log_and_do_command_progress_pause "sudo isomorph --add main
$MNT_POINT/mmorphix/morphed/$SETTING_MYMORPH_MAIN
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH /tmp/tmp.iso"
log_and_do_command "mv -f /tmp/tmp.iso $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH";;
@@ -1035,7 +1057,7 @@
xdialog_message "$MESSAGE_REBRAND"
xdialog_message "$MESSAGE_REBRAND_2"
xdialog_file_select "$MESSAGE_REBRAND_3" "$MNT_POINT"
- log_and_do_command_progress "sudo morphix-rebrand
+ log_and_do_command_progress_pause "sudo morphix-rebrand
$MNT_POINT/mmorphix/iso/$SETTING_MYMORPH
/tmp/tmp.iso
$RETURN_VALUE"
@@ -1061,13 +1083,13 @@
#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
+ log_and_do_command_progress_pause "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
+ log_and_do_command_progress_pause "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
+ log_and_do_command_progress_pause "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
+ log_and_do_command_progress_pause "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"
@@ -1075,7 +1097,7 @@
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
+ log_and_do_command_progress_pause "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)
@@ -1087,7 +1109,7 @@
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
+ log_and_do_command_progress_pause "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
@@ -1096,7 +1118,7 @@
-p morphix-grub-menulist-udeb
-p morphix-iso-grubtheme
/tmp/tmp.iso"
- log_and_do_command_progress "sudo morphix-rebrand /tmp/tmp.iso
+ log_and_do_command_progress_pause "sudo morphix-rebrand /tmp/tmp.iso
$MNT_POINT/mmorphix/iso/MorphixLiveKiosk.iso
/tmp/MorphixLiveKiosk.png";;
1)
@@ -1132,7 +1154,7 @@
255)
closing_mmorphix "morphing_test_qemu";;
esac
- log_and_do_command "sudo qemu -boot d $TMP_NET
+ log_and_do_command_progress_pause "sudo qemu -boot d $TMP_NET
-cdrom $MNT_POINT/mmorphix/iso/$SETTING_MYMORPH"
fi
main_menu
@@ -1152,7 +1174,7 @@
if [ "$?" = "1" ]
then
log_file "terminal_morphing"
- log_and_do_command_progress "sudo sh"
+ log_and_do_command_progress "cd $MNT_POINT/mmorphix; sudo sh"
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