X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=debman;h=5217f3a31f5eac5b57be22386c9ae0bdf03ff8c3;hp=76c0b35593dd2780000f2a5959e2270bf817940d;hb=2adf11af91685c88f66ab5464b5ed5398e2b5d50;hpb=c554251571769f112578257cd55ca6ad08997380

diff --git a/debman b/debman
index 76c0b35..5217f3a 100755
--- a/debman
+++ b/debman
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/bash -e
 
 # debman - read a man page from an uninstalled Debian package file (.deb)
 
@@ -26,7 +26,7 @@ usage () {
         FD=1
     fi
     cat >&$FD <<EOF
-Usage: debman [options] [-- man options] <man page name> ...
+Usage: debman [options] [-- man(1) options] <man page name> ...
 
 Options should be exactly one of:
         -f package.deb          read pages from package.deb archive
@@ -83,12 +83,13 @@ TEMPDIR=`mktemp -dt debman.XXXXXXXXXX`
 trap 'rm -rf "$TEMPDIR"' EXIT ERR HUP INT QUIT TERM
 
 if [ -n "$PACKAGE" ]; then
-    # This duplicates debget; if an option is added there to use an
-    # externally-specified filename then we can use it instead.
-    FILENAME="$TEMPDIR/$PACKAGE.deb"
-    wget -O "$FILENAME" \
-        $(apt-get -q2 --print-uris --reinstall install "$PACKAGE" | \
-          sed -ne "\$s/^'\([^']*\)'.*$/\1/p")
+    (cd "$TEMPDIR" && debget "$PACKAGE")
+    # There should be at most one file in $TEMPDIR now.
+    FILENAME="`find \"$TEMPDIR\" -name \*.deb -print`"
+    if [ -z "$FILENAME" ]; then
+        echo "Failed to fetch package $PACKAGE; exiting." >&2
+        exit 1
+    fi
 fi
 
 # Ignore errors from tar (though not dpkg). They'll generally just be of the