Use curl if available.

git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-92

diff --git a/ChangeLog b/ChangeLog
index 6a9acb43e684dac7bbda09000102c05fc4a99352..51fc299cc616e5cc89fc39be0cc0788299dfd91d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-13  Martin Mares  <mj@ucw.cz>
+
+       * update-pciids.sh: Use curl if available. Patch by Matthew Wilcox.
+
 2006-01-04  Martin Mares  <mj@ucw.cz>
 
        * lspci.c (show_express_link): Fixed decoding of link status register.

diff --git a/update-pciids.man b/update-pciids.man
index e28dcabd9e645e02ef4a2fb7a730096f2faba7bc..d2ee69c2fc0d2e33f2e224e4e334ffe63b9cca07 100644 (file)
--- a/update-pciids.man
+++ b/update-pciids.man
@@ -12,7 +12,7 @@ update-pciids \- download new version of the PCI ID list
 fetches the current version of the pci.ids file from the primary distribution
 site and installs it.
 
-This utility requires either wget or lynx to be installed. If gzip or bzip2
+This utility requires curl, wget or lynx to be installed. If gzip or bzip2
 are available, it automatically downloads the compressed version of the list.
 
 .SH FILES

diff --git a/update-pciids.sh b/update-pciids.sh
index 146a393db47cb4eecfabd66a546d7fae54dc7a4c..0e21dff52348cee35d734139e5e8c7b93c69f6d4 100755 (executable)
--- a/update-pciids.sh
+++ b/update-pciids.sh
@@ -14,12 +14,14 @@ else
        DECOMP="cat"
 fi
 
-if which wget >/dev/null ; then
+if which curl >/dev/null ; 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
        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