aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-01-02 05:43:25 (GMT)
committermarkt <markt>2007-01-02 05:43:25 (GMT)
commit590b6c93d922a9940cb4c3d78d21509b289bd643 (patch)
tree04895360bf1c118505edeeaed4e7e446ebc0426c
parent1cad4ca517ef9f4fb96b3c83970ed96767d6668e (diff)
downloadfluxbox-590b6c93d922a9940cb4c3d78d21509b289bd643.zip
fluxbox-590b6c93d922a9940cb4c3d78d21509b289bd643.tar.bz2
replace `which' in fbsetbg and fbgm with `command -v'
-rw-r--r--ChangeLog2
-rw-r--r--util/fbsetbg27
-rwxr-xr-xutil/fluxbox-generate_menu.in45
3 files changed, 14 insertions, 60 deletions
diff --git a/ChangeLog b/ChangeLog
index 93e13ea..d5498b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/01/02: 3*07/01/02:
4 * Replace `which' in fbsetbg and fbgm with `command -v' (Mark)
5 util/fbsetbg fluxbox-generate_menu.in
4 * Don't escape regular expression metacharacters in apps file, bug 6 * Don't escape regular expression metacharacters in apps file, bug
5 #1595497 (Mark) 7 #1595497 (Mark)
6 Remember.cc ClientPattern.cc 8 Remember.cc ClientPattern.cc
diff --git a/util/fbsetbg b/util/fbsetbg
index 60118e5..917f89a 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -131,28 +131,9 @@ Common tips to use with $command:
131EOF 131EOF
132} 132}
133 133
134# some which's have a reliable return code, some don't 134find_it() {
135# Lets figure out which which we have. 135 command -v $1 > /dev/null 2>&1 && shift && $*
136if which this_program_does_not_exist-no_really-aA1zZ9 >/dev/null 2>/dev/null; then 136}
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
156 137
157message() { 138message() {
158 139
@@ -349,7 +330,7 @@ if [ "$setterfromcommandline" != true ]; then
349 if [ ! "$wpsetter" = Esetroot ]; then 330 if [ ! "$wpsetter" = Esetroot ]; then
350 WPSETTER=$wpsetter 331 WPSETTER=$wpsetter
351 break 332 break
352 elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then 333 elif ldd `command -v Esetroot`|grep libImlib 2>&1 > /dev/null; then
353 WPSETTER=$wpsetter 334 WPSETTER=$wpsetter
354 break 335 break
355 else 336 else
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 80a2af2..cd168fc 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -124,42 +124,13 @@ fluxbox-generate_menu was brought to you by:
124EOF 124EOF
125} 125}
126 126
127# some which's have a reliable return code, some don't 127find_it() {
128# Lets figure out which which we have. 128 command -v $1 > /dev/null 2>&1 && shift && "$@"
129if which this_program_does_not_exist-no_really-aA1zZ9 2> /dev/null 1> /dev/null; then 129}
130 # can't rely on return value
131 find_it() {
132 file=`which $1 2> /dev/null`
133 if [ -x "$file" ]; then
134 if [ $# -gt 1 ]; then
135 shift
136 "$@"
137 fi
138 return 0
139 else
140 return 1
141 fi
142 }
143
144 find_it_options() {
145 file=`which $1 2> /dev/null`
146 if [ -x "$file" ]; then
147 return 0
148 else
149 return 1
150 fi
151 }
152
153else
154 # can rely on return value
155 find_it() {
156 which $1 > /dev/null 2>&1 && shift && "$@"
157 }
158 130
159 find_it_options() { 131find_it_options() {
160 which $1 > /dev/null 2>&1 132 command -v $1 > /dev/null 2>&1
161 } 133}
162fi
163 134
164#echo "replaceWithinString: $1, $2, $3" >&2 135#echo "replaceWithinString: $1, $2, $3" >&2
165#echo ${1//$2/$3} # causes error in BSD even though not used 136#echo ${1//$2/$3} # causes error in BSD even though not used
@@ -211,7 +182,7 @@ convertIcon(){
211 if [ -f "${entry_icon}" ]; then 182 if [ -f "${entry_icon}" ]; then
212 : echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2 183 : echo "File exists. To overwrite, type: convert \"$1\" \"$entry_icon\"" >&2
213 else 184 else
214 if which convert &> /dev/null; then 185 if command -v convert &> /dev/null; then
215 convert "$1" "$entry_icon" 186 convert "$1" "$entry_icon"
216 # echo convert "$1" , "$entry_icon" >> $ICONMAPPING 187 # echo convert "$1" , "$entry_icon" >> $ICONMAPPING
217 else 188 else
@@ -1378,7 +1349,7 @@ fi
1378# prefix 1349# prefix
1379PREFIX="${PREFIX:=@PREFIX@}" 1350PREFIX="${PREFIX:=@PREFIX@}"
1380if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then 1351if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
1381 PREFIX=`which fluxbox | sed 's,/bin/fluxbox$,,'` 1352 PREFIX=`command -v fluxbox | sed 's,/bin/fluxbox$,,'`
1382fi 1353fi
1383 1354
1384 1355