update-pciids: Re-compress pci.ids if needed

Previously, if pciutils were configured with compression of pci.ids,
update-pciids downloaded the gzipped version. Now, it downloads the
most compressed version for which tools are found installed, and
recompresses it to gzip if needed.

1 files changed, 16 insertions, 10 deletions

diff --git a/update-pciids.sh b/update-pciids.sh
index 3263339..1fa604e 100755
--- a/update-pciids.sh
+++ b/update-pciids.sh
@@ -16,11 +16,7 @@ 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 command -v xz >/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
@@ -52,12 +48,12 @@ if ! $DL ; then
 	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
@@ -65,10 +61,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.