fix for multi desktop entries in menu files

This commit is contained in:
rathnor 2003-08-03 04:12:03 +00:00
parent 6bbc5c43ca
commit fef1df762f

View file

@ -22,7 +22,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
# $Id: fluxbox-generate_menu,v 1.45 2003/08/02 15:08:06 rathnor Exp $ # $Id: fluxbox-generate_menu,v 1.46 2003/08/03 04:12:03 rathnor Exp $
# #
# Portability notes: # Portability notes:
@ -142,8 +142,8 @@ append_menu_end() {
menu_entry() { menu_entry() {
if [ -f "$1" ]; then if [ -f "$1" ]; then
append "[exec] (`grep '^[ ]*Name=' \"$1\" | cut -d = -f 2`) \ append "[exec] (`grep '^[ ]*Name=' \"$1\" | head -1 | cut -d = -f 2`) \
{`grep '^[ ]*Exec=' \"$1\" | cut -d = -f 2`}" {`grep '^[ ]*Exec=' \"$1\" | head -1 | cut -d = -f 2`}"
fi fi
} }
@ -863,7 +863,7 @@ append_menu_end
# We'll only use this once # We'll only use this once
ETCAPPLNK=/etc/X11/applnk ETCAPPLNK=/etc/X11/applnk
# gnome menu # gnome menu
if [ -n "${GNOMEMENU}" ]; then if [ "${GNOMEMENU}" ]; then
append_submenu "${GNOMEMENUTEXT}" append_submenu "${GNOMEMENUTEXT}"
recurse_dir_menu "${GNOME_PREFIX}/share/gnome/apps" "$HOME/.gnome/apps" ${ETCAPPLNK} recurse_dir_menu "${GNOME_PREFIX}/share/gnome/apps" "$HOME/.gnome/apps" ${ETCAPPLNK}
append_menu_end append_menu_end
@ -871,7 +871,7 @@ if [ -n "${GNOMEMENU}" ]; then
fi fi
# kde submenu # kde submenu
if [ -n "${KDEMENU}" ]; then if [ -d "${KDE_PREFIX}/share/applnk/" -a "${KDEMENU}" ]; then
append_submenu "${KDEMENUTEXT}" append_submenu "${KDEMENUTEXT}"
recurse_dir_menu "${KDE_PREFIX}/share/applnk" "$HOME/.kde/share/applnk" ${ETCAPPLNK} recurse_dir_menu "${KDE_PREFIX}/share/applnk" "$HOME/.kde/share/applnk" ${ETCAPPLNK}
append_menu_end append_menu_end