aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-10-23 16:22:32 (GMT)
committermathias <mathias>2005-10-23 16:22:32 (GMT)
commitbf7902dae8c43ad4cb62a1b2791eb706612c8e28 (patch)
tree7188638767ba067e3633f2927f0220e6551db287
parentf14c73ed3388a4f995b99e4fedddfc09e2df6e63 (diff)
downloadfluxbox_pavel-bf7902dae8c43ad4cb62a1b2791eb706612c8e28.zip
fluxbox_pavel-bf7902dae8c43ad4cb62a1b2791eb706612c8e28.tar.bz2
Fixed #1335255 (Gentoo #110197), fbgm had some globbing related probs
Patch from thanx t35t0r
-rw-r--r--ChangeLog3
-rwxr-xr-xutil/fluxbox-generate_menu.in4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4360a01..79d28b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.15: 2Changes for 0.9.15:
3*05/10/23:
4 * Fixed #1335255 (Gentoo #110197) fbgm had some globbing related probs (thanx t35t0r)
5 fluxbox-generate_menu.in
3*05/10/21: 6*05/10/21:
4 * Fixed #1223878, Style reloading on USR2 (thanx Zan) 7 * Fixed #1223878, Style reloading on USR2 (thanx Zan)
5 Screen.cc 8 Screen.cc
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 4c2e863..4d85db9 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -133,7 +133,7 @@ if which this_program_does_not_exist-no_really-aA1zZ9 2> /dev/null 1> /dev/null;
133 if [ -x "$file" ]; then 133 if [ -x "$file" ]; then
134 if [ $# -gt 1 ]; then 134 if [ $# -gt 1 ]; then
135 shift 135 shift
136 $* 136 "$@"
137 fi 137 fi
138 return 0 138 return 0
139 else 139 else
@@ -153,7 +153,7 @@ if which this_program_does_not_exist-no_really-aA1zZ9 2> /dev/null 1> /dev/null;
153else 153else
154 # can rely on return value 154 # can rely on return value
155 find_it() { 155 find_it() {
156 which $1 > /dev/null 2>&1 && shift && $* 156 which $1 > /dev/null 2>&1 && shift && "$@"
157 } 157 }
158 158
159 find_it_options() { 159 find_it_options() {