diff options
| author | Martin Mares <mj@ucw.cz> | 2023-03-04 16:33:09 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2023-03-04 16:33:09 +0100 |
| commit | 85f05a7c92b23d7e306be5feb5a5ae26a47afe67 (patch) | |
| tree | 0853b77baaf12a0b82d64c6fc563008a25253253 | |
| parent | 30957f075883d179ae04487d0833cb79ed9c31f4 (diff) | |
| download | pciutils-85f05a7c92b23d7e306be5feb5a5ae26a47afe67.tar.gz | |
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...
| -rwxr-xr-x | update-pciids.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/update-pciids.sh b/update-pciids.sh index 3ea4690..929f6af 100755 --- 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" |