X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=update-pciids.sh;h=3ea46904033356a29a865601f75bd98c44653565;hb=9a07a7f5ca8dd2c89fd41387fcd0aa761554d25f;hp=a084f7b35de741ed91c75cdaf5d38ee42939122b;hpb=cc062b4ade94481589af2b6dc94e280caab94498;p=pciutils.git

diff --git a/update-pciids.sh b/update-pciids.sh
index a084f7b..3ea4690 100755
--- a/update-pciids.sh
+++ b/update-pciids.sh
@@ -1,30 +1,42 @@
 #!/bin/sh
 
 set -e
-SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
+
+SRC="https://pci-ids.ucw.cz/v2.2/pci.ids"
 DEST=pci.ids
 PCI_COMPRESSED_IDS=
 GREP=grep
 
-if [ -n "$PCI_COMPRESSED_IDS" ] ; then
+[ "$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 [ "$PCI_COMPRESSED_IDS" = 1 ] ; then
 	DECOMP="cat"
 	SRC="$SRC.gz"
 	GREP=zgrep
-elif which bzip2 >/dev/null ; then
+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 curl >/dev/null ; then
+if which curl >/dev/null 2>&1 ; then
 	DL="curl -o $DEST.new $SRC"
-elif which wget >/dev/null ; then
-	DL="wget -O $DEST.new $SRC"
-elif which lynx >/dev/null ; then
+	${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 curl, wget or lynx"
@@ -48,11 +60,17 @@ if ! $GREP >/dev/null "^C " $DEST.neww ; then
 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
 
-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."