summaryrefslogtreecommitdiff
path: root/util/fbsetbg
diff options
context:
space:
mode:
authormarkt <markt>2007-02-22 16:51:35 (GMT)
committermarkt <markt>2007-02-22 16:51:35 (GMT)
commited96d79a14f3078a291bc569c6c5f8926eacdbb3 (patch)
tree5742a05a01da5323632549205ad52ce44a2aa1ac /util/fbsetbg
parent3d789a1e709f87170398b525643794cf6ff52fde (diff)
downloadfluxbox_lack-ed96d79a14f3078a291bc569c6c5f8926eacdbb3.zip
fluxbox_lack-ed96d79a14f3078a291bc569c6c5f8926eacdbb3.tar.bz2
command -v seems to cause problems for some distros, despite being POSIX and built into sh
Diffstat (limited to 'util/fbsetbg')
-rw-r--r--util/fbsetbg27
1 files changed, 23 insertions, 4 deletions
diff --git a/util/fbsetbg b/util/fbsetbg
index 917f89a..60118e5 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -131,9 +131,28 @@ Common tips to use with $command:
131EOF 131EOF
132} 132}
133 133
134find_it() { 134# some which's have a reliable return code, some don't
135 command -v $1 > /dev/null 2>&1 && shift && $* 135# Lets figure out which which we have.
136} 136if which this_program_does_not_exist-no_really-aA1zZ9 >/dev/null 2>/dev/null; then
137 # can't rely on return value
138 find_it() {
139 file=`which $1 2> /dev/null`
140 if [ -x "$file" ]; then
141 if [ $# -gt 1 ]; then
142 shift
143 $*
144 fi
145 return 0
146 else
147 return 1
148 fi
149 }
150else
151 # can rely on return value
152 find_it() {
153 which $1 > /dev/null 2>&1 && shift && $*
154 }
155fi
137 156
138message() { 157message() {
139 158
@@ -330,7 +349,7 @@ if [ "$setterfromcommandline" != true ]; then
330 if [ ! "$wpsetter" = Esetroot ]; then 349 if [ ! "$wpsetter" = Esetroot ]; then
331 WPSETTER=$wpsetter 350 WPSETTER=$wpsetter
332 break 351 break
333 elif ldd `command -v Esetroot`|grep libImlib 2>&1 > /dev/null; then 352 elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then
334 WPSETTER=$wpsetter 353 WPSETTER=$wpsetter
335 break 354 break
336 else 355 else