X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=update-pciids.sh;h=5e771090ac001fb92b816d5d00eacdab6b83d524;hb=4c2bdb019375b5b2167959a167710791225b6670;hp=ea89610ffcca88e1f6eb2338e7fd6ed0546d5f5f;hpb=80b3121adfc9560880e5971788589f7338579b0f;p=pciutils.git

diff --git a/update-pciids.sh b/update-pciids.sh
index ea89610..5e77109 100755
--- a/update-pciids.sh
+++ b/update-pciids.sh
@@ -1,25 +1,44 @@
 #!/bin/sh
 
+[ "$1" = "-q" ] && quiet=true || quiet=false
+
 set -e
-SRC="http://pciids.sourceforge.net/pci.ids"
+SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
 DEST=pci.ids
+PCI_COMPRESSED_IDS=
+GREP=grep
+
+# 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" -eq 1 ] ; then
+	DECOMP="cat"
+	SRC="$SRC.gz"
+	GREP=zgrep
+elif which bzip2 >/dev/null 2>&1 ; then
 	DECOMP="bzip2 -d"
 	SRC="$SRC.bz2"
-elif which gzip >/dev/null ; then
+elif which gzip >/dev/null 2>&1 ; then
 	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 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"
 else
-	echo >&2 "update-pciids: cannot find wget nor lynx"
+	echo >&2 "update-pciids: cannot find curl, wget or lynx"
 	exit 1
 fi
 
@@ -34,7 +53,7 @@ if ! $DECOMP <$DEST.new >$DEST.neww ; then
 	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
@@ -47,4 +66,10 @@ 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."