lib: fixup DOE status register bit

[pciutils.git] / update-pciids.sh

diff --git a/update-pciids.sh b/update-pciids.sh
index ea89610ffcca88e1f6eb2338e7fd6ed0546d5f5f..929f6af716ec8dbe03870aaa9bb3e285544fd18e 100755 (executable)
--- a/update-pciids.sh
+++ b/update-pciids.sh
@@ -1,25 +1,45 @@
 #!/bin/sh
 
 set -e
 #!/bin/sh
 
 set -e

-SRC="http://pciids.sourceforge.net/pci.ids"
+
+SRC="https://pci-ids.ucw.cz/v2.2/pci.ids"

 DEST=pci.ids
 DEST=pci.ids

+PCI_COMPRESSED_IDS=
+GREP=grep
+
+[ "$1" = "-q" ] && quiet=true || quiet=false
+
+# if pci.ids is read-only (because the filesystem is read-only),
+# then just skip this whole process.
+if ! touch ${DEST} >/dev/null 2>&1 ; then
+       ${quiet} || echo "${DEST} is read-only, exiting." 1>&2
+       exit 1
+fi

 
 

-if which bzip2 >/dev/null ; then
+if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
+       DECOMP="cat"
+       SRC="$SRC.gz"
+       GREP=zgrep
+elif command -v bzip2 >/dev/null 2>&1 ; then

        DECOMP="bzip2 -d"
        SRC="$SRC.bz2"
        DECOMP="bzip2 -d"
        SRC="$SRC.bz2"

-elif which gzip >/dev/null ; then
+elif command -v gzip >/dev/null 2>&1 ; then

        DECOMP="gzip -d"
        SRC="$SRC.gz"
 else
        DECOMP="cat"
 fi
 
        DECOMP="gzip -d"
        SRC="$SRC.gz"
 else
        DECOMP="cat"
 fi
 

-if which wget >/dev/null ; then
-       DL="wget -O $DEST.new $SRC"
-elif which lynx >/dev/null ; then
+if command -v curl >/dev/null 2>&1 ; then
+       DL="curl -o $DEST.new $SRC"
+       ${quiet} && DL="$DL -s -S"
+elif command -v wget >/dev/null 2>&1 ; then
+       DL="wget --no-timestamping -O $DEST.new $SRC"
+       ${quiet} && DL="$DL -q"
+elif command -v lynx >/dev/null 2>&1 ; then

        DL="eval lynx -source $SRC >$DEST.new"
 else
        DL="eval lynx -source $SRC >$DEST.new"
 else

-       echo >&2 "update-pciids: cannot find wget nor lynx"
+       echo >&2 "update-pciids: cannot find curl, wget or lynx"

        exit 1
 fi
 
        exit 1
 fi
 


@@ -34,17 +54,23 @@ if ! $DECOMP <$DEST.new >$DEST.neww ; then
        exit 1
 fi
 
        exit 1
 fi
 

-if ! grep >/dev/null "^C " $DEST.neww ; then
+if ! $GREP >/dev/null "^C " $DEST.neww ; then

        echo >&2 "update-pciids: missing class info, probably truncated file"
        exit 1
 fi
 
 if [ -f $DEST ] ; then
        echo >&2 "update-pciids: missing class info, probably truncated file"
        exit 1
 fi
 
 if [ -f $DEST ] ; then

-       mv $DEST $DEST.old
+       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
 fi
 mv $DEST.neww $DEST
 rm $DEST.new
 
        # --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
 fi
 mv $DEST.neww $DEST
 rm $DEST.new
 

-echo "Done."
+# Older versions did not compress the ids file, so let's make sure we
+# clean that up.
+if [ ${DEST%.gz} != ${DEST} ] ; then
+       rm -f ${DEST%.gz} ${DEST%.gz}.old
+fi
+
+${quiet} || echo "Done."