diff options
author | rathnor <rathnor> | 2003-08-03 04:12:03 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-08-03 04:12:03 (GMT) |
commit | fef1df762f9316c753d914e6b22989f5f8923b97 (patch) | |
tree | 2b5e17264ceb7fabf08d5447945b70e2a4269599 /util | |
parent | 6bbc5c43ca469d70710887e3b7ae5b5dbecb1ca8 (diff) | |
download | fluxbox_lack-fef1df762f9316c753d914e6b22989f5f8923b97.zip fluxbox_lack-fef1df762f9316c753d914e6b22989f5f8923b97.tar.bz2 |
fix for multi desktop entries in menu files
Diffstat (limited to 'util')
-rwxr-xr-x | util/fluxbox-generate_menu | 10 |
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 | ||
143 | menu_entry() { | 143 | menu_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 |
864 | ETCAPPLNK=/etc/X11/applnk | 864 | ETCAPPLNK=/etc/X11/applnk |
865 | # gnome menu | 865 | # gnome menu |
866 | if [ -n "${GNOMEMENU}" ]; then | 866 | if [ "${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 | |||
871 | fi | 871 | fi |
872 | 872 | ||
873 | # kde submenu | 873 | # kde submenu |
874 | if [ -n "${KDEMENU}" ]; then | 874 | if [ -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 |