x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 525315c..33b0153 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -330,13 +330,13 @@ searchForIcon(){
     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
     if [ -f "$entry_icon" ]; then
     # if icon exists and entry does not already exists, add it
-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
-            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
+        if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
         else 
-            : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+            : echo "#    mapping already exists for ${execname}" >> $ICONMAPPING
         fi
     else
-        echo "# No icon file found for $entry_exec" >> $ICONMAPPING
+        echo "# No icon file found for $execname" >> $ICONMAPPING
     fi
 }