From: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Date: Tue, 4 Dec 2012 03:08:09 +0000 (-0800)
Subject: Use curl, with the correct settings to avoid re-fetching files.
X-Git-Tag: hwids-20121203
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c55af00fbca986ec9e0450c0e7e215a742f82011;p=oweals%2Fhwids.git

Use curl, with the correct settings to avoid re-fetching files.

This is now critical as oui.txt and iab.txt are quite big.
---

diff --git a/Makefile b/Makefile
index d21ed83..346eafe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,18 @@
-# can be replaced with `wget -q -O -` if you want
 ifeq "$(V)" "0"
-  HTTPCAT = curl -s
   STATUS = git status -s
   Q=@
 else
-  HTTPCAT = curl
   STATUS = git status
   Q=
 endif
 
 fetch:
-	$(Q)$(HTTPCAT) http://pci-ids.ucw.cz/v2.2/pci.ids.bz2 | bzcat > pci.ids
-	$(Q)$(HTTPCAT) http://www.linux-usb.org/usb.ids.bz2 | bzcat > usb.ids
-	$(Q)$(HTTPCAT) http://standards.ieee.org/develop/regauth/oui/oui.txt > oui.txt
-	$(Q)$(HTTPCAT) http://standards.ieee.org/develop/regauth/iab/iab.txt > iab.txt
-	$(Q)$(HTTPCAT) http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-acpi-vendor.hwdb > udev/20-acpi-vendor.hwdb
-	$(Q)$(HTTPCAT) http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/ids-update.pl > udev-hwdb-update.pl
+	$(Q)curl -z pci.ids -o pci.ids -R http://pci-ids.ucw.cz/v2.2/pci.ids
+	$(Q)curl -z usb.ids -o usb.ids -R http://www.linux-usb.org/usb.ids
+	$(Q)curl -z oui.txt -o oui.txt -R http://standards.ieee.org/develop/regauth/oui/oui.txt
+	$(Q)curl -z iab.txt -o iab.txt -R http://standards.ieee.org/develop/regauth/iab/iab.txt
+	$(Q)curl -z udev/20-acpi-vendor.hwdb -o udev/20-acpi-vendor.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-acpi-vendor.hwdb
+	$(Q)curl -z udev-hwdb-update.pl -o udev-hwdb-update.pl -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/ids-update.pl
 	$(Q)$(STATUS)
 
 PV ?= $(shell ( awk '$$2 == "Date:" { print $$3; nextfile }' pci.ids usb.ids; git log --format=format:%ci -1 -- oui.txt hwdb/20-acpi-vendor.hwdb udev-hwdb-update.pl | cut -d ' ' -f1; ) | sort | tail -n 1 | tr -d -)