summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-08-03 04:12:03 (GMT)
committerrathnor <rathnor>2003-08-03 04:12:03 (GMT)
commitfef1df762f9316c753d914e6b22989f5f8923b97 (patch)
tree2b5e17264ceb7fabf08d5447945b70e2a4269599
parent6bbc5c43ca469d70710887e3b7ae5b5dbecb1ca8 (diff)
downloadfluxbox_lack-fef1df762f9316c753d914e6b22989f5f8923b97.zip
fluxbox_lack-fef1df762f9316c753d914e6b22989f5f8923b97.tar.bz2
fix for multi desktop entries in menu files
-rwxr-xr-xutil/fluxbox-generate_menu10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu
index 9eebfd2..3a33157 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.45 2003/08/02 15:08:06 rathnor Exp $ 25# $Id: fluxbox-generate_menu,v 1.46 2003/08/03 04:12:03 rathnor Exp $
26 26
27# 27#
28# Portability notes: 28# Portability notes:
@@ -142,8 +142,8 @@ append_menu_end() {
142 142
143menu_entry() { 143menu_entry() {
144 if [ -f "$1" ]; then 144 if [ -f "$1" ]; then
145 append "[exec] (`grep '^[ ]*Name=' \"$1\" | cut -d = -f 2`) \ 145 append "[exec] (`grep '^[ ]*Name=' \"$1\" | head -1 | cut -d = -f 2`) \
146 {`grep '^[ ]*Exec=' \"$1\" | cut -d = -f 2`}" 146 {`grep '^[ ]*Exec=' \"$1\" | head -1 | cut -d = -f 2`}"
147 fi 147 fi
148} 148}
149 149
@@ -863,7 +863,7 @@ append_menu_end
863# We'll only use this once 863# We'll only use this once
864ETCAPPLNK=/etc/X11/applnk 864ETCAPPLNK=/etc/X11/applnk
865# gnome menu 865# gnome menu
866if [ -n "${GNOMEMENU}" ]; then 866if [ "${GNOMEMENU}" ]; then
867 append_submenu "${GNOMEMENUTEXT}" 867 append_submenu "${GNOMEMENUTEXT}"
868 recurse_dir_menu "${GNOME_PREFIX}/share/gnome/apps" "$HOME/.gnome/apps" ${ETCAPPLNK} 868 recurse_dir_menu "${GNOME_PREFIX}/share/gnome/apps" "$HOME/.gnome/apps" ${ETCAPPLNK}
869 append_menu_end 869 append_menu_end
@@ -871,7 +871,7 @@ if [ -n "${GNOMEMENU}" ]; then
871fi 871fi
872 872
873# kde submenu 873# kde submenu
874if [ -n "${KDEMENU}" ]; then 874if [ -d "${KDE_PREFIX}/share/applnk/" -a "${KDEMENU}" ]; then
875 append_submenu "${KDEMENUTEXT}" 875 append_submenu "${KDEMENUTEXT}"
876 recurse_dir_menu "${KDE_PREFIX}/share/applnk" "$HOME/.kde/share/applnk" ${ETCAPPLNK} 876 recurse_dir_menu "${KDE_PREFIX}/share/applnk" "$HOME/.kde/share/applnk" ${ETCAPPLNK}
877 append_menu_end 877 append_menu_end