diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in index bc010628..225d287c 100755 --- a/util/fluxbox-generate_menu.in +++ b/util/fluxbox-generate_menu.in @@ -49,7 +49,7 @@ display_usage() { cat << EOF Usage: @pkgprefix@fluxbox-generate_menu@pkgsuffix@ [-kgrBh] [-t terminal] [-w url] [-b browser] [-m menu-title] [-o /path] [-u /path] [-p /path] [-n /path] [-q /path] - [-d /path ] [-ds] [-i /path] [-is] [-su] + [-d /path ] [-ds] [-i /path] [-is] [-do] EOF } @@ -59,16 +59,14 @@ display_help() { Options: - -k Insert a KDE menu - -g Add a Gnome menu -B Enable backgrounds menu - -su Enable sudo commands + -do Enable doas commands -r Don't remove empty menu-entries; for templates -d Other path(s) to recursively search for *.desktop files -ds Wider search for *.desktop files (takes more time) -i Other path(s) to search for icons - e.g., "/usr/kde/3.3/share/icons/crystalsvg/16x16/*" + e.g., "/usr/share/icons/Adwaita/16x16/*" -is Wider search for icons (worth the extra time) -in Skip icon search @@ -85,9 +83,6 @@ Options: Only for packagers: -p Prefix; default is @PREFIX@ - -n Gnome-prefix; /opt, /usr, /usr/X11R6 and /usr/local autodetected - -q KDE-prefix; idem dito - Files: ~/.@pkgprefix@fluxbox@pkgsuffix@/usermenu Your own submenu which will be included in the menu @@ -104,8 +99,6 @@ display_authors() { Henrik Kinnunen: Project leader. Han Boetes: Packaging, debugging and scripts. - Simon Bowden: Cleanups and compatibility for SUN. - Jeramy B. Smith: Packaging assistance, Gnome and KDE menu system. Filippo Pappalardo: Italian locales and -t option. $WHOAMI: Innocent bystander. @@ -524,10 +517,10 @@ cli_find() { done } -sudo_find() { - [ "${DOSUDO}" = yes ] || return +doas_find() { + [ "${DOAS}" = yes ] || return while [ "$1" ]; do - find_it $1 append "[exec] ($1 (as root)) {${DEFAULT_TERM} -e sudo $1}" + find_it $1 append "[exec] ($1 (as root)) {${DEFAULT_TERM} -e doas $1}" shift done } @@ -586,9 +579,7 @@ FBSETTINGSMENU='Fluxbox menu' FILEUTILSMENU='File utils' FLUXBOXCOMMAND='Fluxbox Command' GAMESMENU='Games' -GNOMEMENUTEXT='Gnome-menus' GRAPHICMENU='Graphics' -KDEMENUTEXT='KDE-menus' LOCKSCREEN='Lock screen' MISCMENU='Misc' MULTIMEDIAMENU='Multimedia' @@ -636,9 +627,7 @@ case ${LC_ALL} in FILEUTILSMENU='æÁÊÌÏ×ÙÅ ÕÔÉÌÉÔÙ' FLUXBOXCOMMAND='÷ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ' GAMESMENU='éÇÒÙ' - GNOMEMENUTEXT='Gnome-ÍÅÎÀ' GRAPHICMENU='çÒÁÆÉËÁ' - KDEMENUTEXT='KDE-ÍÅÎÀ' LOCKSCREEN='úÁÂÌÏËÉÒÏ×ÁÔØ ÜËÒÁÎ' MISCMENU='ðÒÏÞÅÅ' MUSICMENU='ú×ÕË' @@ -677,9 +666,7 @@ case ${LC_ALL} in FILEUTILSMENU='Souborové utility' FLUXBOXCOMMAND='Pøíkaz Fluxboxu' GAMESMENU='Hry' - GNOMEMENUTEXT='Gnome-menu' GRAPHICMENU='Grafika' - KDEMENUTEXT='KDE-menu' LOCKSCREEN='Zamknout obrazovku' MISCMENU='Rùzné' MULTIMEDIAMENU='Multimédia' @@ -720,9 +707,7 @@ case ${LC_ALL} in FILEUTILSMENU='Datei-Utilities' FLUXBOXCOMMAND='Fluxbox Befehl' GAMESMENU='Spiele' - GNOMEMENUTEXT='Gnome-Menues' GRAPHICMENU='Grafik' - KDEMENUTEXT='Kde-Menues' LOCKSCREEN='Bildschirmsperre' MISCMENU='Sonstiges' MUSICMENU='Musik' @@ -763,9 +748,7 @@ case ${LC_ALL} in FILEUTILSMENU='Filverktyg' FLUXBOXCOMMAND='Fluxbox kommando' GAMESMENU='Spel' - GNOMEMENUTEXT='Gnome-menyer' GRAPHICMENU='Grafik' - KDEMENUTEXT='KDE-menyer' LOCKSCREEN='Lås skärm' MISCMENU='Blandat' MULTIMEDIAMENU='Multimedia' @@ -803,9 +786,7 @@ case ${LC_ALL} in FILEUTILSMENU='Verkenners' FLUXBOXCOMMAND='Fluxbox Commando' GAMESMENU='Spelletjes' - GNOMEMENUTEXT='Gnome-menu' GRAPHICMENU='Grafisch' - KDEMENUTEXT='KDE-menu' LOCKSCREEN='Scherm op slot' MISCMENU='Onregelmatig' MUSICMENU='Muziek' @@ -843,9 +824,7 @@ case ${LC_ALL} in FILEUTILSMENU='Tiedostotyökalut' FLUXBOXCOMMAND='Fluxbox komentorivi' GAMESMENU='Pelit' - GNOMEMENUTEXT='Gnomen valikot' GRAPHICMENU='Grafiikka' - KDEMENUTEXT='KDE:n valikot' LOCKSCREEN='Lukitse näyttö' MISCMENU='Sekalaista' MUSICMENU='Musiikki' @@ -886,9 +865,7 @@ case ${LC_ALL} in FILEUTILSMENU='¥Õ¥¡¥¤¥ëÁàºî' FLUXBOXCOMMAND='Fluxbox¥³¥Þ¥ó¥É' GAMESMENU='¥²¡¼¥à' - GNOMEMENUTEXT='Gnome¥á¥Ë¥å¡¼' GRAPHICMENU='²èÁü' - KDEMENUTEXT='KDE¥á¥Ë¥å¡¼' LOCKSCREEN='¥¹¥¯¥ê¡¼¥ó¥í¥Ã¥¯' MISCMENU='¤¤¤í¤¤¤í' MUSICMENU='²»³Ú' @@ -930,9 +907,7 @@ case ${LC_ALL} in FILEUTILSMENU='Outils fichiers' FLUXBOXCOMMAND='Commande Fluxbox' GAMESMENU='Jeux' - GNOMEMENUTEXT='Menus Gnome' GRAPHICMENU='Graphisme' - KDEMENUTEXT='Menus KDE' LOCKSCREEN="Verrouiller l'écran" MISCMENU='Divers' MULTIMEDIAMENU='Multimédia' @@ -971,9 +946,7 @@ case ${LC_ALL} in FILEUTILSMENU='Utilità' FLUXBOXCOMMAND='Comando Fluxbox' GAMESMENU='Giochi' - GNOMEMENUTEXT='Gnome' GRAPHICMENU='Grafica' - KDEMENUTEXT='KDE' LOCKSCREEN='Blocca lo schermo' MISCMENU='Varie' MUSICMENU='Musica' @@ -1014,9 +987,7 @@ case ${LC_ALL} in FILEUTILSMENU='Utilitare de fisier' FLUXBOXCOMMAND='Comanda Fluxbox' GAMESMENU='Jocuri' - GNOMEMENUTEXT='Meniu Gnome' GRAPHICMENU='Grafica' - KDEMENUTEXT='Meniu KDE' LOCKSCREEN='Incuie ecranul' MISCMENU='Diverse' MULTIMEDIAMENU='Multimedia' @@ -1056,9 +1027,7 @@ case ${LC_ALL} in FILEUTILSMENU='Utilidades' FLUXBOXCOMMAND='Comandos de Fluxbox' GAMESMENU='Juegos' - GNOMEMENUTEXT='Menús Gnome' GRAPHICMENU='Gráficos' - KDEMENUTEXT='Menús KDE' LOCKSCREEN='Bloquear Pantalla' MISCMENU='Varios' MULTIMEDIAMENU='Multimedia' @@ -1102,9 +1071,7 @@ case ${LC_ALL} in FILEUTILSMENU='Narzêdzia do plików' FLUXBOXCOMMAND='Polecenia Fluxbox' GAMESMENU='Gry' - GNOMEMENUTEXT='Menu Gnome' GRAPHICMENU='Grafika' - KDEMENUTEXT='Menu KDE' LOCKSCREEN='Zablokuj ekran' MISCMENU='Ró¿ne' MULTIMEDIAMENU='Multimedia' @@ -1144,9 +1111,7 @@ case ${LC_ALL} in FILEUTILSMENU='Utilitários de Ficheiros' FLUXBOXCOMMAND='Comando Fluxbox' GAMESMENU='Jogos' - GNOMEMENUTEXT='Menu Gnome' GRAPHICMENU='Gráficos' - KDEMENUTEXT='Menu KDE' LOCKSCREEN='Trancar Ecrã' MISCMENU='Misc.' MULTIMEDIAMENU='Multimédia' @@ -1188,9 +1153,7 @@ case ${LC_ALL} in FILEUTILSMENU='Filverktøy' FLUXBOXCOMMAND='FluxBox-kommando' GAMESMENU='Spill' - GNOMEMENUTEXT='Gnome-menyer' GRAPHICMENU='Grafikk' - KDEMENUTEXT='KDE-menyer' LOCKSCREEN='LÃ¥s skjermen' MISCMENU='Diverse' MULTIMEDIAMENU='Multimedia' @@ -1226,7 +1189,7 @@ MENUTITLE="${MENUTITLE:=Fluxbox}" HOMEPAGE="${HOMEPAGE:=fluxbox.org}" USERMENU="${USERMENU:=${USERFLUXDIR}/usermenu}" MENUCONFIG="${MENUCONFIG:=${USERFLUXDIR}/menuconfig}" -DOSUDO="no" +DOAS="no" # Read the menuconfig file if it exists or else create it. # But not during install time, use envvar for sun @@ -1243,11 +1206,11 @@ if [ ! "${INSTALL}" = Yes ]; then # Your favourite terminal. Put the command in quotes if you want to use # options. Put a backslash in before odd chars -# MY_TERM='Eterm --tint \#123456' -# MY_TERM='aterm -tint \$(random_color)' +# MY_TERM='sakura --tint \#123456' +# MY_TERM='xterm -tint \$(random_color)' # Your favourite browser. You can also specify options. -# MY_BROWSER=mozilla +# MY_BROWSER=iceweasel-uxp # Name of the outputfile # MENUFILENAME=${USERFLUXDIR}/menu @@ -1275,8 +1238,6 @@ if [ ! "${INSTALL}" = Yes ]; then # there should be no need to specify them. # # PREFIX=@PREFIX@ -# GNOME_PREFIX=/opt/gnome -# KDE_PREFIX=/opt/kde # Separate the list of background dirs with colons ':' @@ -1290,14 +1251,8 @@ if [ ! "${INSTALL}" = Yes ]; then # Include all backgrounds in your backgrounds-directory # BACKGROUNDMENUITEM=yes -# Include KDE-menus -# KDEMENU=yes - -# Include Gnome-menus -# GNOMEMENU=yes - -# Enable sudo commands -# DOSUDO=yes +# Enable doas commands +# DOAS=yes # Don't cleanup the menu # REMOVE=no @@ -1323,8 +1278,6 @@ fi while [ $# -gt 0 ]; do case "$1" in -B) BACKGROUNDMENUITEM=yes; shift;; - -k) KDEMENU=yes; shift;; - -g) GNOMEMENU=yes; shift;; -in) NO_ICON=yes; shift;; -is) OTHER_ICONPATHS=" /usr/share/icons @@ -1338,43 +1291,39 @@ while [ $# -gt 0 ]; do /usr/local/share/xclass/icons /usr/local/share/xclass/pixmaps /usr/X11R6/share/icons/default/16x16 - /usr/X11R6/share/icons/kde/16x16 /usr/X11R6/share/icons/hicolor/16x16 /usr/local/X11R6/share/icons/default/16x16 - /usr/local/X11R6/share/icons/kde/16x16 /usr/local/X11R6/share/icons/hicolor/16x16 " shift;; -ds) OTHER_DESKTOP_PATHS=" - /usr/share/mimelnk + /usr/share/mimelnk /usr/share/applications - /usr/share/xsessions - /usr/share/services + /usr/share/xsessions + /usr/share/services " # /usr/share/apps \ shift;; -i) USER_ICONPATHS=${2}; - #needs testing + #needs testing for aPath in $2; do - testoption di $1 $aPath; + testoption di $1 $aPath; done shift 2;; -d) USER_DESKTOP_PATHS=${2}; - #needs testing + #needs testing for aPath in $2; do - testoption di $1 $aPath; + testoption di $1 $aPath; done shift 2;; -t) MY_TERM=${2}; testoption ex $1 $2; shift 2;; -b) MY_BROWSER=${2}; testoption ex $1 $2; shift 2;; -o) MENUFILENAME=${2}; shift 2; CHECKINIT=NO ;; -p) PREFIX=${2}; testoption di $1 $2; shift 2;; - -n) GNOME_PREFIX=${2}; testoption di $1 $2; shift 2;; - -q) KDE_PREFIX=${2}; testoption di $1 $2; shift 2;; -m) MENUTITLE=${2}; testoption sk $1 $2; shift 2;; -w) HOMEPAGE=${2}; testoption sk $1 $2; shift 2;; -u) USERMENU=${2}; testoption fl $1 $2; shift 2;; - -su) DOSUDO=yes; shift;; + -do) DOAS=yes; shift;; -r) REMOVE=no; shift;; -h) display_help ; exit 0 ;; -a) display_authors ; exit 0 ;; @@ -1424,38 +1373,14 @@ if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@$,,'` fi - -# gnome prefix -for GNOME_PREFIX in "${GNOME_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do - if [ -n "${GNOME_PREFIX}" -a -d "$GNOME_PREFIX/share/gnome" ]; then - break; - fi -done # Will remain $PREFIX if all else fails -# kde prefix -for KDE_PREFIX in "${KDE_PREFIX}" /usr/local /usr/X11R6 /usr /opt "${PREFIX}"; do - if [ -n "${KDE_PREFIX}" -a -d "$KDE_PREFIX/share/applnk" ]; then - break; - fi -done - if [ -z "${INSTALL}" ] && [ -z "${NO_ICON}" ]; then # [ -z "$dnlamVERBOSE" ] && dnlamVERBOSE=": echo" # for debugging FB_ICONDIR="$USERFLUXDIR/icons" [ -r "$FB_ICONDIR" ] || mkdir "$FB_ICONDIR" ICONMAPPING="$USERFLUXDIR/iconmapping" - if [ "$GNOMEMENU" ] ; then - OTHER_DESKTOP_PATHS="\"$HOME/.gnome/apps\" \"${GNOME_PREFIX}/share/gnome/apps\" $OTHER_DESKTOP_PATHS" - #[ "OTHER_ICONPATHS" ] && OTHER_ICONPATHS= - fi - if [ "$KDEMENU" ] ; then - OTHER_DESKTOP_PATHS="\"$HOME/.kde/share/applnk\" \"${KDE_PREFIX}/share/applnk\" $OTHER_DESKTOP_PATHS" - [ "OTHER_ICONPATHS" ] && OTHER_ICONPATHS="\"$HOME\"/.kde/share/icons/{,*} $OTHER_ICONPATHS" - fi - [ "$GNOMEMENU$KDEMENU" ] && OTHER_DESKTOP_PATHS="\"$ETCAPPLNK\" $OTHER_DESKTOP_PATHS" - checkDirs(){ #echo checkDirs: $* >&2 local CHECKED_DIRS="" @@ -1476,7 +1401,7 @@ if [ -z "${INSTALL}" ] && [ -z "${NO_ICON}" ]; then # $dnlamVERBOSE "Using OTHER_ICONPATHS=$OTHER_ICONPATHS" # $dnlamVERBOSE "Using OTHER_DESKTOP_PATHS=$OTHER_DESKTOP_PATHS" # $dnlamVERBOSE "Calling function: createIconMapping" - + # $dnlamVERBOSE "Creating $ICONMAPPING" >&2 touch "$ICONMAPPING" eval createIconMapping $USER_DESKTOP_PATHS $OTHER_DESKTOP_PATHS @@ -1494,7 +1419,7 @@ if find_it_options $MY_TERM; then else [ -n "$MY_TERM" ] && echo "Warning: you chose an invalid term." >&2 #The precise order is up for debate. - for term in Eterm urxvt urxvtc aterm mrxvt rxvt wterm konsole gnome-terminal xterm; do + for term in rxvt-unicode wterm sakura st xterm; do if find_it_options $term; then DEFAULT_TERM=$term break @@ -1522,7 +1447,7 @@ if find_it_options $MY_BROWSER; then else [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 #The precise order is up for debate. - for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do + for browser in dillo elinks iceweasel-uxp links lynx midori netsurf otter-browser; do if find_it_options $browser; then DEFAULT_BROWSER=$browser break @@ -1533,7 +1458,7 @@ DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'` if [ "x$DEFAULT_BROWSERNAME" != "x" ]; then DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` else - DEFAULT_BROWSERNAME="firefox" + DEFAULT_BROWSERNAME="iceweasel-uxp" fi if [ -z "$LAUNCHER" ]; then @@ -1584,236 +1509,159 @@ fi append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}" case "$DEFAULT_BROWSERNAME" in - links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; - firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; - konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; - opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; - MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; - MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;; + elinks|links|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; + iceweasel-uxp|dillo) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; esac find_it "${LAUNCHER}" append "[exec] (${RUNCOMMAND}) {$LAUNCHER_CMD}" - append_submenu "${TERMINALMENU}" - normal_find xterm urxvt urxvtc gnome-terminal multi-gnome-terminal Eterm \ - konsole aterm mlterm multi-aterm rxvt mrxvt + normal_find rxvt-unicode sakura st xterm append_menu_end append_submenu "${NETMENU}" append_submenu "${BROWSERMENU}" - normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer + normal_find dillo iceweasel-uxp midori netsurf vncviewer find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}" - find_it opera append "[exec] (opera) {env QT_XFT=true opera}" - find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}" - find_it w3m append "[exec] (w3m) {${DEFAULT_TERM} -e w3m ${HOMEPAGE}}" + find_it elinks append "[exec] (elinks) {${DEFAULT_TERM} -e elinks ${HOMEPAGE}}" find_it lynx append "[exec] (lynx) {${DEFAULT_TERM} -e lynx ${HOMEPAGE}}" append_menu_end append_submenu IM - normal_find pidgin gaim kopete gnomemeeting sim kadu psi amsn aim ayttm everybuddy gabber ymessenger - find_it licq append "[exec] (licq) {env QT_XFT=true licq}" - cli_find centericq micq + normal_find pidgin dino + cli_find profanity append_menu_end append_submenu Mail - normal_find sylpheed kmail evolution thunderbird mozilla-thunderbird \ - sylpheed-claws claws-mail - cli_find mutt pine + normal_find icedove-uxp claws-mail + cli_find mutt append_menu_end append_submenu News - normal_find liferea pears pan - cli_find slrn tin + normal_find liferea append_menu_end append_submenu IRC - normal_find xchat xchat-2 ksirc vyqchat lostirc logui konversation kvirc skype - 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}" + normal_find hexchat + cli_find weechat append_menu_end append_submenu P2P - normal_find gtk-gnutella lopster nicotine pyslsk xmule amule \ - valknut dcgui-qt dc_qt quickdc asami azureus - cli_find TekNap giFTcurs + normal_find amule append_menu_end append_submenu FTP - normal_find gftp IglooFTP-PRO kbear - cli_find ncftp pftp ftp lftp yafc + normal_find filezilla + cli_find lftp append_menu_end append_submenu SMB - normal_find LinNeighborhood jags SambaSentinel + normal_find pyneighborhood smbclient append_menu_end append_submenu "${ANALYZERMENU}" - normal_find xnmap nmapfe wireshark ettercap - sudo_find xnmap nmapfe wireshark ettercap + normal_find nmap wireshark ettercap + doas_find nmap wireshark ettercap append_menu_end - normal_find x3270 wpa_gui + normal_find wpa_supplicant_gui append_menu_end append_submenu "${EDITORMENU}" - normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \ - wings xemacs emacs kvim cream evim scite Ted - cli_find nano vim vi zile jed joe + normal_find emacs featherpad gvim geany lumina-textedit + cli_find nano nvi vim vi 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 append_submenu "${EDUCATIONMENU}" - normal_find celestia scilab geomview scigraphica oregano xcircuit electric \ - pymol elem chemtool xdrawchem gperiodic stellarium - find_it drgeo append "[exec] (Dr. Geo) {drgeo}" - find_it R append "[exec] (R) {${DEFAULT_TERM} -e R --gui=gnome}" - cli_find maxima grace yacas octave gnuplot grass coq acl + normal_find celestia oregano pymol stellarium xcircuit xdrawchem + cli_find acl coq gnuplot grace grass maxima append_menu_end append_submenu "${FILEUTILSMENU}" - find_it konqueror append "[exec] (konqueror) {kfmclient openProfile filemanagement}" - normal_find gentoo krusader kcommander linuxcmd rox tuxcmd krename xfe xplore worker endeavour2 evidence - find_it nautilus append "[exec] (nautilus) {nautilus --no-desktop --browser}" - cli_find mc + normal_find lumina-fm rox spacefm xfe + cli_find mc ranger append_menu_end append_submenu "${MULTIMEDIAMENU}" append_submenu "${GRAPHICMENU}" - normal_find gimp gimp2 gimp-2.2 inkscape sodipodi xv gqview showimg xpaint kpaint kiconedit \ - ee xzgv xscreensaver-demo xlock gphoto tuxpaint krita skencil - find_it xnview append "[exec] (xnview browser) {xnview -browser}" - find_it blender append "[exec] (blender) {blender -w}" - find_it gears append "[exec] (Mesa gears) {gears}" - find_it morph3d append "[exec] (Mesa morph) {morph3d}" - find_it reflect append "[exec] (Mesa reflect) {reflect}" + normal_find gimp gphoto inkscape krita gqview tuxpaint xpaint xlockmore xzgv + find_it blender append "[exec] (blender) {blender -w}" append_menu_end append_submenu "${MUSICMENU}" - normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gnome-alsamixer gmix kmix kscd \ - grecord kmidi xplaycd soundtracker grip easytag audacity \ - zinf rhythmbox kaboodle beep-media-player amarok tagtool \ - audacious bmpx - cli_find cdcd cplay alsamixer orpheus mp3blaster + normal_find audacious audacity deadbeef + cli_find cmus append_menu_end append_submenu "${VIDEOMENU}" - normal_find xine gxine aviplay gtv gmplayer xmovie xcdroast xgdb \ - realplay xawtv fxtv ogle goggles vlc + normal_find goggles vlc xcdroast xawtv find_it dvdrip append "[exec] (dvdrip) {nohup dvdrip}" + cli_find mpv smplayer append_menu_end append_submenu "${XUTILSMENU}" - normal_find xfontsel xman xload xbiff editres viewres xclock \ - xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave - find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}" + normal_find xenocara-editres xenocara-viewres xenocara-xbiff xenocara-xclock xenocara-xfontsel xenocara-xload xenocara-xmag + find_it xenocara-xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}" append_menu_end append_menu_end append_submenu "${OFFICEMENU}" - normal_find xclock xcalc kcalc grisbi qbankmanager evolution - find_it gcalc append "[exec] (gcalc) {gcalc}" || \ - find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" - find_it ical append "[exec] (Calendar) {ical}" + normal_find xenocara-xcalc xenocara-xclock + find_it gsimplecal append "[exec] (Calendar) {gsimplecal}" # older <=1.1.3 apparently have stuff like swriter, not sowriter - for ext in s so oo xoo; do - find_it ${ext}ffice2 && ( - find_it ${ext}ffice2 append "[exec] (Open Office 2) {${ext}ffice2}" - find_it ${ext}base2 append "[exec] (OO Base 2) {${ext}base2}" - find_it ${ext}calc2 append "[exec] (OO Calc 2) {${ext}calc2}" - find_it ${ext}writer2 append "[exec] (OO Writer 2) {${ext}writer2}" - find_it ${ext}web2 append "[exec] (OO Web 2) {${ext}web2}" - find_it ${ext}html2 append "[exec] (OO HTML 2) {${ext}html2}" - find_it ${ext}impress2 append "[exec] (OO Impress 2) {${ext}impress2}" - find_it ${ext}draw2 append "[exec] (OO Draw 2) {${ext}draw2}" - find_it ${ext}math2 append "[exec] (OO Math 2) {${ext}math2}" - find_it ${ext}fromtemplate2 append "[exec] (OO Templates 2) {${ext}fromtemplate2}" - ) + for ext in libreo oo; do find_it ${ext}ffice && ( - find_it ${ext}ffice append "[exec] (Open Office) {${ext}ffice}" - find_it ${ext}base append "[exec] (OO Base) {${ext}base}" - find_it ${ext}calc append "[exec] (OO Calc) {${ext}calc}" - find_it ${ext}writer append "[exec] (OO Writer) {${ext}writer}" - find_it ${ext}web append "[exec] (OO Web) {${ext}web}" - find_it ${ext}impress append "[exec] (OO Impress) {${ext}impress}" - find_it ${ext}draw append "[exec] (OO Draw) {${ext}draw}" - find_it ${ext}math append "[exec] (OO Math) {${ext}math}" - find_it ${ext}fromtemplate append "[exec] (OO Templates) {${ext}fromtemplate}" - find_it ${ext}padmin append "[exec] (OO Printer Admin) {${ext}padmin}" - find_it mrproject append "[exec] (Mr.Project) {mrproject}" + find_it ${ext}ffice append "[exec] (LO Office) {${ext}ffice}" + find_it ${ext}base append "[exec] (LO Base) {${ext}base}" + find_it ${ext}calc append "[exec] (LO Calc) {${ext}calc}" + find_it ${ext}writer append "[exec] (LO Writer) {${ext}writer}" + find_it ${ext}impress append "[exec] (LO Impress) {${ext}impress}" + find_it ${ext}draw append "[exec] (LO Draw) {${ext}draw}" + find_it ${ext}math append "[exec] (LO Math) {${ext}math}" ) done - normal_find abiword kword wordperfect katoob lyx acroread xpdf gv ghostview + normal_find abiword libwpd poppler gvim normal_find dia xfig normal_find gnumeric append_menu_end append_submenu "${GAMESMENU}" - normal_find bzflag gnibbles gnobots2 tuxpuck gataxx glines \ - gnect mahjongg gnomine gnome-stones gnometris gnotravex \ - gnotski iagno knights eboard xboard scid freecell pysol \ - gtali tuxracer xpenguins xsnow xeyes smclone \ - openmortal quake2 quake3 skoosh same-gnome enigma xbill \ - icebreaker scorched3d sol dosbox black-box freeciv \ - freeciv-server frozen-bubble liquidwar qt-nethack \ - nethack-gnome pathological scummvm xqf \ - wesnoth canfeild ace_canfeild golf merlin chickens \ - supertux tuxdash neverball cube_client blackjack \ - doom doom3 quake4 blackshades gltron kpoker concentration \ - torrent scramble kiki xmoto warsow wormux zsnes - cli_find gnugo xgame - - find_it et append "[exec] (Enemy Territory) {et}" - find_it ut append "[exec] (Unreal Tournament) {ut}" - find_it ut2003 append "[exec] (Unreal Tournament 2003) {ut2003}" - find_it ut2004 append "[exec] (Unreal Tournament 2004) {ut2004}" + normal_find 7kaa allegro allegro-legacy angband antimicrox blobby2 \ + bombermaaan boswars box2d bullet dolphin-emu dosbox \ + dustrac endless-sky extremetuxracer flare-game freedm \ + freedoom freedroidrpg freeorion gigamesh gweled hex-a-hop \ + libgme libmanette lincity-ng megaglest megaglest-data \ + mgba-qt mgba-sdl minetest minetest-server neverball \ + openblok opensurge pingus pioneer pioneers plib scratch \ + scummvm scummvm-tools signus supertux supertuxkart surgescript \ + teeworlds trigger-rally warzone2100 warzone2100-legacy \ + wesnoth widelands wyrmsun xmahjongg xmoto append_menu_end append_submenu "${SYSTEMTOOLSMENU}" append_submenu "${BURNINGMENU}" - normal_find k3b cdbakeoven graveman xcdroast arson eroaster gcombust \ - gtoaster kiso kover gtkcdlabel kcdlabel cdw cdlabelgen - cli_find mp3burn cdrx burncenter + normal_find cdw dvd+rw-tools simpleburn append_menu_end - normal_find firestarter gtk-lshw gproftd gpureftpd guitoo porthole gtk-iptables \ - gtk-cpuspeedy - find_it fireglcontrol append "[exec] (ATI Config) {fireglcontrol}" - cli_find top htop iotop ntop powertop + normal_find vsftpd + cli_find top htop bpytop append_menu_end - # We'll only use this once ETCAPPLNK=/etc/X11/applnk PARSING_DESKTOP="true" -# gnome menu -if [ "${GNOMEMENU}" ]; then - append_submenu "${GNOMEMENUTEXT}" - recurse_dir_menu "${GNOME_PREFIX}/share/gnome/apps" "$HOME/.gnome/apps" ${ETCAPPLNK} - append_menu_end - unset ETCAPPLNK -fi -# kde submenu -if [ -d "${KDE_PREFIX}/share/applnk/" -a "${KDEMENU}" ]; then - append_submenu "${KDEMENUTEXT}" - recurse_dir_menu "${KDE_PREFIX}/share/applnk" "$HOME/.kde/share/applnk" ${ETCAPPLNK} - append_menu_end - unset ETCAPPLNK -fi unset PARSING_DESKTOP #User menu @@ -1887,17 +1735,14 @@ append_submenu "${FBSETTINGSMENU}" append_submenu "${WINDOWMANAGERS}" #hard to properly maintain since there are so many exceptions to the rule. - for wm in mwm twm wmii beryl compiz metacity icewm ion kde sawfish enlightenment fvwm openbox evilwm waimea xfce pekwm xfce4 fvwm2 blackbox ; do + for wm in blackbox enlightenment16 fvwm3 icewm openbox sawfish xenocara-twm; do find_it start${wm} append "[restart] (${wm}) {start${wm}}" ||\ find_it ${wm} append "[restart] (${wm}) {${wm}}" done - find_it startgnome append "[restart] (gnome) {startgnome}" ||\ - find_it gnome-session append "[restart] (gnome) {gnome-session}" - find_it startwindowmaker append "[restart] (windowmaker) {startwindowmaker}" ||\ find_it wmaker append "[restart] (windowmaker) {wmaker}" append_menu_end - find_it xlock append "[exec] (${LOCKSCREEN}) {xlock}" ||\ + find_it xlockmore append "[exec] (${LOCKSCREEN}) {xlock}" ||\ find_it xscreensaver-command append "[exec] (${LOCKSCREEN}) {xscreensaver-command -lock}" append "[commanddialog] (${FLUXBOXCOMMAND})" append "[reconfig] (${RELOADITEM})" @@ -1922,7 +1767,8 @@ if [ ! "${REMOVE}" ]; then fi # escapes any parentheses in menu label -# e.g., "[exec] (konqueror (web))" becomes "[exec] (konqueror (web\))" +# e.g., "[exec] (iceweasel-uxp (web))" becomes "[exec] (iceweasel-uxp (web\))" + sed 's/(\(.*\)(\(.*\)))/(\1 (\2\\))/' $MENUFILENAME > $MENUFILENAME.tmp mv -f $MENUFILENAME.tmp $MENUFILENAME