libpci: ecam: Fix big address range mappings

[pciutils.git] / update-pciids.sh

diff --git a/update-pciids.sh b/update-pciids.sh
index 3ea46904033356a29a865601f75bd98c44653565..607502ad45a51a033cc336eac5ca538e2af91202 100755 (executable)
--- a/update-pciids.sh
+++ b/update-pciids.sh
@@ -6,6 +6,9 @@ SRC="https://pci-ids.ucw.cz/v2.2/pci.ids"
 DEST=pci.ids
 PCI_COMPRESSED_IDS=
 GREP=grep
+VERSION=unknown
+USER_AGENT=update-pciids/$VERSION
+QUIET=
 
 [ "$1" = "-q" ] && quiet=true || quiet=false
 
@@ -16,45 +19,53 @@ if ! touch ${DEST} >/dev/null 2>&1 ; then
        exit 1
 fi
 
-if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
-       DECOMP="cat"
-       SRC="$SRC.gz"
-       GREP=zgrep
-elif which bzip2 >/dev/null 2>&1 ; then
+if command -v xz >/dev/null 2>&1 ; then
+       DECOMP="xz -d"
+       SRC="$SRC.xz"
+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
-       DL="curl -o $DEST.new $SRC"
-       ${quiet} && DL="$DL -s -S"
-elif which 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
-       DL="eval lynx -source $SRC >$DEST.new"
+if command -v curl >/dev/null 2>&1 ; then
+       ${quiet} && QUIET="-s -S"
+       dl ()
+       {
+               curl -o $DEST.new --user-agent "$USER_AGENT curl" $QUIET $SRC
+       }
+elif command -v wget >/dev/null 2>&1 ; then
+       ${quiet} && QUIET="-q"
+       dl ()
+       {
+               wget --no-timestamping -O $DEST.new --user-agent "$USER_AGENT wget" $QUIET $SRC
+       }
+elif command -v lynx >/dev/null 2>&1 ; then
+       dl ()
+       {
+               lynx -source -useragent="$USER_AGENT lynx" $SRC >$DEST.new
+       }
 else
        echo >&2 "update-pciids: cannot find curl, wget or lynx"
        exit 1
 fi
 
-if ! $DL ; then
+if ! dl ; then
        echo >&2 "update-pciids: download failed"
        rm -f $DEST.new
        exit 1
 fi
 
-if ! $DECOMP <$DEST.new >$DEST.neww ; then
+if ! $DECOMP <$DEST.new >$DEST.new.plain ; then
        echo >&2 "update-pciids: decompression failed, probably truncated file"
        exit 1
 fi
 
-if ! $GREP >/dev/null "^C " $DEST.neww ; then
+if ! $GREP >/dev/null "^C " $DEST.new.plain ; then
        echo >&2 "update-pciids: missing class info, probably truncated file"
        exit 1
 fi
@@ -62,10 +73,20 @@ fi
 if [ -f $DEST ] ; then
        ln -f $DEST $DEST.old
        # --reference is supported only by chmod from GNU file, so let's ignore any errors
-       chmod -f --reference=$DEST.old $DEST.neww 2>/dev/null || true
+       chmod -f --reference=$DEST.old $DEST.new $DEST.new.plain 2>/dev/null || true
+fi
+
+if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
+       if [ "${SRC%.gz}" != .gz ] ; then
+               # Recompress to gzip
+               gzip <$DEST.new.plain >$DEST.new
+       fi
+       mv $DEST.new $DEST
+       rm -f $DEST.new.plain
+else
+       mv $DEST.new.plain $DEST
+       rm -f $DEST.new
 fi
-mv $DEST.neww $DEST
-rm $DEST.new
 
 # Older versions did not compress the ids file, so let's make sure we
 # clean that up.