Use "command -v" instead of "which"

Apparently, people started considering "which" obsolete. I still
consider "which" rather useful and definitely more comfortable to type
than "command -v".

Still, "command -v" should be more portable, so let us use it.
I wonder which of the ancient systems which we are still supporting
will be broken by this change...

diff --git a/update-pciids.sh b/update-pciids.sh
index 3ea46904033356a29a865601f75bd98c44653565..929f6af716ec8dbe03870aaa9bb3e285544fd18e 100755 (executable)
--- a/update-pciids.sh
+++ b/update-pciids.sh
@@ -20,23 +20,23 @@ if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
        DECOMP="cat"
        SRC="$SRC.gz"
        GREP=zgrep
-elif which bzip2 >/dev/null 2>&1 ; then
+elif command -v bzip2 >/dev/null 2>&1 ; then
        DECOMP="bzip2 -d"
        SRC="$SRC.bz2"
-elif which gzip >/dev/null 2>&1 ; then
+elif command -v gzip >/dev/null 2>&1 ; then
        DECOMP="gzip -d"
        SRC="$SRC.gz"
 else
        DECOMP="cat"
 fi
 
-if which curl >/dev/null 2>&1 ; then
+if command -v curl >/dev/null 2>&1 ; then
        DL="curl -o $DEST.new $SRC"
        ${quiet} && DL="$DL -s -S"
-elif which wget >/dev/null 2>&1 ; then
+elif command -v wget >/dev/null 2>&1 ; then
        DL="wget --no-timestamping -O $DEST.new $SRC"
        ${quiet} && DL="$DL -q"
-elif which lynx >/dev/null 2>&1 ; then
+elif command -v lynx >/dev/null 2>&1 ; then
        DL="eval lynx -source $SRC >$DEST.new"
 else
        echo >&2 "update-pciids: cannot find curl, wget or lynx"