mostly cosmetic changes (tabs -> spaces),
added 'cli_find' which does the same as 'normal_find' but creates entries for cli-programs
This commit is contained in:
parent
859f167cba
commit
f59f5e6c5a
1 changed files with 337 additions and 343 deletions
|
@ -47,7 +47,7 @@
|
|||
|
||||
|
||||
WHOAMI=`whoami`
|
||||
[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
|
||||
[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
|
||||
|
||||
# Check for Imlib2-support
|
||||
if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
|
||||
|
@ -125,7 +125,7 @@ EOF
|
|||
|
||||
# some which's have a reliable return code, some don't
|
||||
# Lets figure out which which we have.
|
||||
if which this_program_does_not_exist-no_really-aA1zZ9 >/dev/null 2>/dev/null; then
|
||||
if which this_program_does_not_exist-no_really-aA1zZ9 2> /dev/null 1> /dev/null; then
|
||||
# can't rely on return value
|
||||
find_it() {
|
||||
file=`which $1 2> /dev/null`
|
||||
|
@ -532,6 +532,13 @@ normal_find() {
|
|||
done
|
||||
}
|
||||
|
||||
cli_find() {
|
||||
while [ "$1" ]; do
|
||||
find_it $1 append "[exec] ($1) {${DEFAULT_TERM} -e $1}"
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
clean_up() {
|
||||
[ -f "$ICONMAPPING" ] && rm -f "$ICONMAPPING"
|
||||
|
||||
|
@ -1485,44 +1492,36 @@ append_submenu "${NETMENU}"
|
|||
append_submenu IM
|
||||
normal_find gaim kopete gnomemeeting sim kadu psi
|
||||
find_it licq append "[exec] (licq) {env QT_XFT=true licq}"
|
||||
find_it centericq append "[exec] (centericq) {${DEFAULT_TERM} -e centericq}"
|
||||
find_it micq append "[exec] (micq) {${DEFAULT_TERM} -e micq}"
|
||||
cli_find centericq micq
|
||||
append_menu_end
|
||||
|
||||
append_submenu Mail
|
||||
normal_find sylpheed kmail evolution thunderbird mozilla-thunderbird
|
||||
find_it mutt append "[exec] (mutt) {${DEFAULT_TERM} -e mutt}"
|
||||
normal_find sylpheed kmail evolution thunderbird mozilla-thunderbird \
|
||||
sylpheed-claws
|
||||
cli_find mutt pine
|
||||
append_menu_end
|
||||
|
||||
append_submenu News
|
||||
normal_find liferea pears
|
||||
find_it slrn append "[exec] (slrn) {${DEFAULT_TERM} -e slrn}"
|
||||
cli_find slrn tin
|
||||
append_menu_end
|
||||
|
||||
append_submenu IRC
|
||||
normal_find xchat ksirc vyqchat lostirc logui konversation kvirc
|
||||
find_it irssi append "[exec] (irssi) {${DEFAULT_TERM} -e irssi}"
|
||||
cli_find irssi epic4 weechat ninja
|
||||
find_it BitchX append "[exec] (BitchX) {${DEFAULT_TERM} -e BitchX -N}" || \
|
||||
find_it bitchx append "[exec] (BitchX) {${DEFAULT_TERM} -e bitchx -N}"
|
||||
find_it ircii append "[exec] (ircii) {${DEFAULT_TERM} -e ircii -s}"
|
||||
find_it epic4 append "[exec] (epic4) {${DEFAULT_TERM} -e epic4}"
|
||||
find_it weechat append "[exec] (weechat) {${DEFAULT_TERM} -e weechat}"
|
||||
find_it ninja append "[exec] (ninja) {${DEFAULT_TERM} -e ninja}"
|
||||
append_menu_end
|
||||
|
||||
append_submenu P2P
|
||||
normal_find gtk-gnutella lopster nicotine pyslsk xmule amule dcgui-qt
|
||||
find_it TekNap append "[exec] (TekNap) {${DEFAULT_TERM} -e TekNap}"
|
||||
find_it giFTcurs append "[exec] (giFTcurs) {${DEFAULT_TERM} -e giFTcurs}"
|
||||
cli_find TekNap giFTcurs
|
||||
append_menu_end
|
||||
|
||||
append_submenu ftp
|
||||
normal_find gftp IglooFTP-PRO
|
||||
find_it ncftp append "[exec] (ncftp) {${DEFAULT_TERM} -e ncftp}"
|
||||
find_it pftp append "[exec] (pftp) {${DEFAULT_TERM} -e pftp}"
|
||||
find_it ftp append "[exec] (ftp) {${DEFAULT_TERM} -e ftp}"
|
||||
find_it lftp append "[exec] (lftp) {${DEFAULT_TERM} -e lftp}"
|
||||
find_it yafc append "[exec] (yafc) {${DEFAULT_TERM} -e yafc}"
|
||||
cli_find ncftp pftp ftp lftp yafc
|
||||
append_menu_end
|
||||
|
||||
normal_find pan xnmap skype x3270
|
||||
|
@ -1531,12 +1530,8 @@ append_menu_end
|
|||
|
||||
append_submenu "${EDITORMENU}"
|
||||
normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \
|
||||
wings xemacs emacs kvim cream
|
||||
find_it nano append "[exec] (nano) {${DEFAULT_TERM} -e nano}"
|
||||
find_it vi append "[exec] (vi) {${DEFAULT_TERM} -e vi}" ||\
|
||||
find_it vim append "[exec] (vim) {${DEFAULT_TERM} -e vim}"
|
||||
find_it zile append "[exec] (zile) {${DEFAULT_TERM} -e zile}"
|
||||
find_it jed append "[exec] (jed) {${DEFAULT_TERM} -e jed}"
|
||||
wings xemacs emacs kvim cream evim
|
||||
cli_find nano vim vi zile jed
|
||||
find_it emacs append "[exec] (emacs-nw) {${DEFAULT_TERM} -e emacs -nw}"
|
||||
find_it xemacs append "[exec] (xemacs-nw) {${DEFAULT_TERM} -e xemacs -nw}"
|
||||
append_menu_end
|
||||
|
@ -1544,7 +1539,7 @@ append_menu_end
|
|||
append_submenu "${FILEUTILSMENU}"
|
||||
normal_find konqueror gentoo krusader linuxcmd rox tuxcmd krename xfe
|
||||
find_it nautilus append "[exec] (nautilus) {nautilus --no-desktop}"
|
||||
find_it mc append "[exec] (mc) {${DEFAULT_TERM} -e mc}"
|
||||
cli_find mc
|
||||
append_menu_end
|
||||
|
||||
append_submenu "${MULTIMEDIAMENU}"
|
||||
|
@ -1562,9 +1557,7 @@ append_submenu "${MULTIMEDIAMENU}"
|
|||
normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix kscd \
|
||||
grecord kmidi xplaycd soundtracker grip easytag audacity \
|
||||
zinf rhythmbox kaboodle beep-media-player
|
||||
find_it cdcd append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}"
|
||||
find_it cplay append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}"
|
||||
find_it alsamixer append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}"
|
||||
cli_find cdcd cplay alsamixer orpheus mp3blaster
|
||||
append_menu_end
|
||||
|
||||
|
||||
|
@ -1608,8 +1601,9 @@ append_submenu "${GAMESMENU}"
|
|||
gtali tuxracer xpenguins xsnow xeyes xpenguins smclone \
|
||||
openmortal quake2 quake3 skoosh same-gnome enigma xbill \
|
||||
icebreaker scorched3d sol dosbox black-box enigma freeciv \
|
||||
freeciv-server frozen-bubble liquidwar qt-nethack gnugo \
|
||||
freeciv-server frozen-bubble liquidwar qt-nethack \
|
||||
nethack-gnome pathological scummvm xqf
|
||||
cli_find gnugo
|
||||
|
||||
find_it et append "[exec] (Enemy Territory) {et}"
|
||||
find_it ut append "[exec] (Unreal Tournament) {ut}"
|
||||
|
|
Loading…
Reference in a new issue