aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-17 15:56:37 (GMT)
committerfluxgen <fluxgen>2002-11-17 15:56:37 (GMT)
commitd2b6c8e0fc96d4751aaaaa1247978f8aacac65a9 (patch)
tree31a9975a344474da0074a19c6e256b5355c69fed
parentc515dc040a8b5446cf471f7140a1a6843e04b742 (diff)
downloadfluxbox-d2b6c8e0fc96d4751aaaaa1247978f8aacac65a9.zip
fluxbox-d2b6c8e0fc96d4751aaaaa1247978f8aacac65a9.tar.bz2
update
-rwxr-xr-xutil/fluxbox-generate_menu28
1 files changed, 14 insertions, 14 deletions
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu
index e7746c8..09a2071 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.10 2002/11/12 19:19:14 fluxgen Exp $ 25# $Id: fluxbox-generate_menu,v 1.11 2002/11/17 15:56:37 fluxgen Exp $
26 26
27[ `id -u` -eq 0 ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin 27[ `id -u` -eq 0 ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
28 28
@@ -92,14 +92,14 @@ append_menu() {
92} 92}
93 93
94append_submenu() { 94append_submenu() {
95 # empty line for readability 95 # only an empty line in templates
96 [ ${REMOVE} ] && echo >> ${FILENAME} 96 [ ${REMOVE} ] && echo >> ${FILENAME}
97 append_menu "[submenu] ($1)" 97 append_menu "[submenu] ($1)"
98} 98}
99 99
100append_menu_end() { 100append_menu_end() {
101 append_menu "[end]" 101 append_menu "[end]"
102 # empty line for readability 102 # only an empty line in templates
103 [ ${REMOVE} ] && echo >> ${FILENAME} 103 [ ${REMOVE} ] && echo >> ${FILENAME}
104} 104}
105 105
@@ -179,7 +179,7 @@ fi
179 179
180#packagedatadir 180#packagedatadir
181if [ ! -d "${PKGDATADIR}" ]; then 181if [ ! -d "${PKGDATADIR}" ]; then
182 if [ `uname` = "Linux" ];then 182 if [ `uname` = "Linux" ];then
183 PKGDATADIR=/usr/share 183 PKGDATADIR=/usr/share
184 else 184 else
185 PKGDATADIR=/usr/local/share 185 PKGDATADIR=/usr/local/share
@@ -451,19 +451,19 @@ append_submenu ${NETMENU}
451 find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m fluxbox.org}" 451 find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m fluxbox.org}"
452 find_it lynx append "[exec] (lynx) {${DEFAULT_TERM} -e lynx fluxbox.org}" 452 find_it lynx append "[exec] (lynx) {${DEFAULT_TERM} -e lynx fluxbox.org}"
453 append_menu_end 453 append_menu_end
454 454
455 append_submenu IM 455 append_submenu IM
456 normal_find gaim kopete gnomemeeting 456 normal_find gaim kopete gnomemeeting
457 find_it licq append "[exec] (licq) {env QT_XFT=true licq}" 457 find_it licq append "[exec] (licq) {env QT_XFT=true licq}"
458 append_menu_end 458 append_menu_end
459 459
460 append_submenu Mail 460 append_submenu Mail
461 normal_find sylpheed kmail evolution 461 normal_find sylpheed kmail evolution
462 find_it mutt append "[exec] (mutt) {${DEFAULT_TERM} -e mutt}" 462 find_it mutt append "[exec] (mutt) {${DEFAULT_TERM} -e mutt}"
463 append_menu_end 463 append_menu_end
464 464
465 append_submenu IRC 465 append_submenu IRC
466 normal_find xchat 466 normal_find xchat
467 find_it irssi append "[exec] (irssi) {${DEFAULT_TERM} -e irssi}" 467 find_it irssi append "[exec] (irssi) {${DEFAULT_TERM} -e irssi}"
468 find_it BitchX append "[exec] (BitchX) {${DEFAULT_TERM} -e BitchX -N}" 468 find_it BitchX append "[exec] (BitchX) {${DEFAULT_TERM} -e BitchX -N}"
469 [ $? -ne 0 ] && \ 469 [ $? -ne 0 ] && \
@@ -496,18 +496,18 @@ append_submenu ${MULTIMEDIAMENU}
496 496
497 497
498 append_submenu ${MISCMENU} 498 append_submenu ${MISCMENU}
499 normal_find xine aviplay gtv gmplayer xmovie xcdroast xgdb ddd realplay 499 normal_find xine aviplay gtv gmplayer xmovie xcdroast xgdb ddd realplay
500 find_it dvdrip append "[exec] (dvdrip) {nohup dvdrip}" 500 find_it dvdrip append "[exec] (dvdrip) {nohup dvdrip}"
501 append_menu_end 501 append_menu_end
502 502
503 append_submenu ${XUTILSMENU} 503 append_submenu ${XUTILSMENU}
504 normal_find xfontsel xman xload xfigxbiff editres viewres xclock 504 normal_find xfontsel xman xload xfigxbiff editres viewres xclock
505 append_menu_end 505 append_menu_end
506append_menu_end 506append_menu_end
507 507
508 508
509append_submenu ${OFFICEMENU} 509append_submenu ${OFFICEMENU}
510 normal_find xclock xcalc kcalc 510 normal_find xclock xcalc kcalc
511 find_it gcalc append "[exec] (gcalc) {gcalc}" 511 find_it gcalc append "[exec] (gcalc) {gcalc}"
512 [ $? -ne 0 ] && \ 512 [ $? -ne 0 ] && \
513 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" 513 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}"
@@ -527,7 +527,7 @@ append_menu_end
527# gnome menu 527# gnome menu
528if [ -d ${GPKGDATADIR}/gnome/apps -a "${GNOMEMENU}" ]; then 528if [ -d ${GPKGDATADIR}/gnome/apps -a "${GNOMEMENU}" ]; then
529 append_submenu ${GNOMEMENUTEXT} 529 append_submenu ${GNOMEMENUTEXT}
530 for a in ${GPKGDATADIR}/gnome/apps/* ; do 530 for a in `ls ${GPKGDATADIR}/gnome/apps/` ; do
531 if [ -d ${GPKGDATADIR}/gnome/apps/"${a}" ] ; then 531 if [ -d ${GPKGDATADIR}/gnome/apps/"${a}" ] ; then
532 append_submenu "${a}" 532 append_submenu "${a}"
533 menu_entry_dir "${GPKGDATADIR}/gnome/apps/${a}" 533 menu_entry_dir "${GPKGDATADIR}/gnome/apps/${a}"
@@ -541,7 +541,7 @@ fi
541# kde submenu 541# kde submenu
542if [ -d ${KPKGDATADIR}/applnk/ -a "${KDEMENU}" ]; then 542if [ -d ${KPKGDATADIR}/applnk/ -a "${KDEMENU}" ]; then
543 append_submenu ${KDEMENUTEXT} 543 append_submenu ${KDEMENUTEXT}
544 for a in ${KPKGDATADIR}/applnk/* ; do 544 for a in `ls ${KPKGDATADIR}/applnk/` ; do
545 if [ -d ${KPKGDATADIR}/applnk/"${a}" ]; then 545 if [ -d ${KPKGDATADIR}/applnk/"${a}" ]; then
546 append_submenu "${a}" 546 append_submenu "${a}"
547 for x in ${KPKGDATADIR}/applnk/"${a}"/*; do 547 for x in ${KPKGDATADIR}/applnk/"${a}"/*; do
@@ -567,7 +567,7 @@ fi
567 append_menu "[submenu] (${STYLEMENU}) {${STYLEMENUTITLE}}" 567 append_menu "[submenu] (${STYLEMENU}) {${STYLEMENUTITLE}}"
568 append "[stylesdir] (${PKGDATADIR}/fluxbox/styles)" 568 append "[stylesdir] (${PKGDATADIR}/fluxbox/styles)"
569 append "[stylesdir] (~/.fluxbox/styles)" 569 append "[stylesdir] (~/.fluxbox/styles)"
570 570
571 append_menu_end 571 append_menu_end
572 572
573 append "[workspaces] (${WORKSPACEMENU})" 573 append "[workspaces] (${WORKSPACEMENU})"