diff options
author | fluxgen <fluxgen> | 2003-04-23 13:57:26 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-04-23 13:57:26 (GMT) |
commit | 9014e53be3ad695776be2eed5d80cbaffaa18873 (patch) | |
tree | 4bac7566917103a51c1f8b1ec9faa8881048e8fc /util | |
parent | f1e430540988ad05248f258c2f854909e054f10a (diff) | |
download | fluxbox_lack-9014e53be3ad695776be2eed5d80cbaffaa18873.zip fluxbox_lack-9014e53be3ad695776be2eed5d80cbaffaa18873.tar.bz2 |
update from Han
Diffstat (limited to 'util')
-rwxr-xr-x | util/fluxbox-generate_menu | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu index 93c96cb..1f2ed3e 100755 --- a/util/fluxbox-generate_menu +++ b/util/fluxbox-generate_menu | |||
@@ -22,7 +22,7 @@ | |||
22 | # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | # DEALINGS IN THE SOFTWARE. | 23 | # DEALINGS IN THE SOFTWARE. |
24 | # | 24 | # |
25 | # $Id: fluxbox-generate_menu,v 1.30 2003/04/16 22:25:12 fluxgen Exp $ | 25 | # $Id: fluxbox-generate_menu,v 1.31 2003/04/23 13:57:26 fluxgen Exp $ |
26 | 26 | ||
27 | # | 27 | # |
28 | # Portability notes: | 28 | # Portability notes: |
@@ -44,8 +44,8 @@ WHOAMI=`whoami` | |||
44 | # Functions | 44 | # Functions |
45 | display_usage() { | 45 | display_usage() { |
46 | cat <<EOF | 46 | cat <<EOF |
47 | Usage: fluxbox-generate_menu [-kgrB] [-t terminal] [-w url] [-b browser] | 47 | Usage: fluxbox-generate_menu [-kgrBh] [-t terminal] [-w url] [-b browser] |
48 | [-m menu-title] [-p /path] [-n /path] [-q /path] [-o /path] [-u /path] | 48 | [-m menu-title] [-o /path] [-u /path] [-p /path] [-n /path] [-q /path] |
49 | EOF | 49 | EOF |
50 | } | 50 | } |
51 | 51 | ||
@@ -60,11 +60,11 @@ Options: | |||
60 | -B enable backgroundmenu | 60 | -B enable backgroundmenu |
61 | -r Don't remove empty menu-entries; for templates. | 61 | -r Don't remove empty menu-entries; for templates. |
62 | 62 | ||
63 | -m Menu-title; default is "Fluxbox" | ||
64 | -o Outputfile; default is ~/.fluxbox/menu | ||
65 | -t Favourite terminal | 63 | -t Favourite terminal |
66 | -b Favourite browser | ||
67 | -w Homepage for console-browsers. Default is fluxbox.org. | 64 | -w Homepage for console-browsers. Default is fluxbox.org. |
65 | -b Favourite browser | ||
66 | -m Menu-title; default is "Fluxbox" | ||
67 | -o Outputfile; default is ~/.fluxbox/menu | ||
68 | -u user sub-menu; default is ~/.fluxbox/usermenu | 68 | -u user sub-menu; default is ~/.fluxbox/usermenu |
69 | 69 | ||
70 | -h Display this help | 70 | -h Display this help |
@@ -549,7 +549,7 @@ EOF | |||
549 | fi | 549 | fi |
550 | fi | 550 | fi |
551 | # Get options. | 551 | # Get options. |
552 | while getopts ":Bkhragb:t:p:w:u:n:q:o:m:" COMMAND_LINE_ARGUMENT ; do | 552 | while getopts ":Bkhragb:t:p:w:u:n:q:o:m:-:" COMMAND_LINE_ARGUMENT ; do |
553 | case "${COMMAND_LINE_ARGUMENT}" in | 553 | case "${COMMAND_LINE_ARGUMENT}" in |
554 | B) BACKGROUNDMENUITEM=yes ;; | 554 | B) BACKGROUNDMENUITEM=yes ;; |
555 | k) KDEMENU=yes ;; | 555 | k) KDEMENU=yes ;; |
@@ -566,7 +566,13 @@ while getopts ":Bkhragb:t:p:w:u:n:q:o:m:" COMMAND_LINE_ARGUMENT ; do | |||
566 | r) REMOVE=no ;; | 566 | r) REMOVE=no ;; |
567 | h) display_help ; exit 0 ;; | 567 | h) display_help ; exit 0 ;; |
568 | a) display_authors ; exit 0 ;; | 568 | a) display_authors ; exit 0 ;; |
569 | *) display_usage ; exit 1 ;; | 569 | -) echo "fluxbox-generate_menu doesn't recognize -- gnu-longopts." |
570 | echo 'Use fluxbox-generate_menu -h for a long help message.' | ||
571 | display_usage | ||
572 | exit 1 ;; | ||
573 | *) echo 'Use fluxbox-generate_menu -h for a long help message.' | ||
574 | display_usage | ||
575 | exit 1 ;; | ||
570 | esac | 576 | esac |
571 | done | 577 | done |
572 | # Check defaults | 578 | # Check defaults |
@@ -768,7 +774,15 @@ append_submenu "${OFFICEMENU}" | |||
768 | find_it gcalc append "[exec] (gcalc) {gcalc}" || \ | 774 | find_it gcalc append "[exec] (gcalc) {gcalc}" || \ |
769 | find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" | 775 | find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" |
770 | find_it ooffice append "[exec] (Open Office) {ooffice}" | 776 | find_it ooffice append "[exec] (Open Office) {ooffice}" |
777 | find_it oocalc append "[exec] (OO Calc) {oocalc}" | ||
778 | find_it oowriter append "[exec] (OO Writer) {oowriter}" | ||
779 | find_it ooimpress append "[exec] (OO Impress) {ooimpress}" | ||
780 | find_it oodraw append "[exec] (OO Draw) {oodraw}" | ||
781 | find_it oomath append "[exec] (OO Math) {oomath}" | ||
782 | find_it oopadmin append "[exec] (OO Printer Administration) {oopadmin}" | ||
783 | find_it mrproject append "[exec] (Mr.Project) {mrproject}" | ||
771 | find_it soffice append "[exec] (Star Office) {soffice}" | 784 | find_it soffice append "[exec] (Star Office) {soffice}" |
785 | |||
772 | normal_find abiword kword wordperfect katoob acroread xpdf | 786 | normal_find abiword kword wordperfect katoob acroread xpdf |
773 | append_menu_end | 787 | append_menu_end |
774 | 788 | ||