Rework options for update-archive.sh

It has options: --debian, --ubuntu and --clear. With clear the
cached db for an archive is cleared.. It's good for a corrupt archive
but takes a long time per distro.

diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index 126e727..c0a70ae 100755 (executable)
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -2,6 +2,46 @@
 D0=`dirname $0`
 confdir=`cd $D0; pwd`
 
+usage()
+{
+    cat <<EOF
+Usage: update-archive.sh [OPTIONS]
+Options:
+        [--debian=distros]
+        [--ubuntu=distros]
+        [--clear]
+EOF
+    exit $1
+}
+
+do_help=false
+clear=false
+while test $# -gt 0; do
+    case "$1" in
+        -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+        *) optarg= ;;
+    esac
+    case $1 in
+        --clear)
+            clear=true
+            ;;
+        --debian=*)
+            DEBIAN_DIST=$optarg
+            ;;
+        --ubuntu=*)
+            UBUNTU_DIST=$optarg
+            ;;
+        -*)
+            do_help=true
+            ;;
+    esac
+    shift
+done
+
+if $do_help; then
+       usage 1>&1
+fi
+
 if test ! -f ${confdir}/apt-ftparchive.conf.in; then
        echo "$0: ${condir}/apt-ftparchive.conf.in not found"
        exit 1
@@ -17,16 +57,41 @@ if test ! -x /usr/bin/apt-ftparchive; then
 fi
 
 # gpg -a -d -o Release.gpg Release
+       
+architectures="i386 amd64"
 
+if test "$DEBIAN_DIST"; then
+       for d in $DEBIAN_DIST; do
+               DISTRIBUTIONS="$DISTRIBUTIONS debian/$d"
+       done
+fi
+if test "$UBUNTU_DIST"; then
+       for d in $UBUNTU_DIST; do
+               DISTRIBUTIONS="$DISTRIBUTIONS ubuntu/$d"
+       done
+fi
 
-architectures="i386 amd64"
+# All distributions we know of
+ALLD="ubuntu/lucid ubuntu/natty ubuntu/oneiric ubuntu/precise ubuntu/quantal debian/wheezy debian/squeeze debian/lenny"
 
-if [ "$1" == "" ]; then 
-       DISTRIBUTIONS="ubuntu/lucid ubuntu/natty ubuntu/oneiric ubuntu/precise ubuntu/quantal debian/wheezy debian/squeeze debian/lenny"
+if test -z "$DISTRIBUTIONS"; then
+       DISTRIBUTIONS=$ALLD
 else
-       DISTRIBUTIONS=$1
+       for d in $DISTRIBUTIONS; do
+               bad=true
+               for y in $ALLD; do
+                       if test "$d" = "$y"; then
+                               bad=false
+                       fi
+               done
+               if $bad; then
+                       echo "No such distro $d"
+                       exit 1
+               fi
+       done
 fi
 
+echo "DISTRIBUTIONS=$DISTRIBUTIONS"
 for vdist in $DISTRIBUTIONS ; do
        dist=`basename $vdist`
        vendor=`dirname $vdist`
@@ -38,7 +103,9 @@ for vdist in $DISTRIBUTIONS ; do
        cd $ftpdir
        test -d tmp || mkdir tmp
        # Uncomment to clean the .db (cache)
-       # rm tmp/*
+       if $clean; then
+               rm tmp/*
+       fi
 
        sections=""
        for section in main restricted; do