diff options
-rwxr-xr-x | util/fluxbox-generate_menu | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu index 727177a..1021aae 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.43 2003/08/02 14:42:43 rathnor Exp $ | 25 | # $Id: fluxbox-generate_menu,v 1.44 2003/08/02 14:54:05 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 -v GenericName \"$*\" 2>/dev/null | grep Name= | cut -d = -f 2`) \ | 145 | append "[exec] (`grep '^[ ]*Name=' \"$1\" | cut -d = -f 2`) \ |
146 | {`grep -v TryExec \"$*\" 2>/dev/null| grep Exec= | cut -d = -f 2`}" | 146 | {`grep '^[ ]*Exec=' \"$1\" | cut -d = -f 2`}" |
147 | fi | 147 | fi |
148 | } | 148 | } |
149 | 149 | ||
@@ -163,7 +163,6 @@ menu_entry_dir() { | |||
163 | # recursively build a menu from the listed directories | 163 | # recursively build a menu from the listed directories |
164 | # the dirs are merged | 164 | # the dirs are merged |
165 | recurse_dir_menu () { | 165 | recurse_dir_menu () { |
166 | echo "recurse on $@" | ||
167 | ls "$@"/ 2>/dev/null | sort | uniq | while read name; do | 166 | ls "$@"/ 2>/dev/null | sort | uniq | while read name; do |
168 | for dir in "$@"; do | 167 | for dir in "$@"; do |
169 | if [ -n "$name" -a -d "$dir/$name" ]; then | 168 | if [ -n "$name" -a -d "$dir/$name" ]; then |