stderr to stdout for apt-ftparchive generate

[git-tools-moved-to-github.git] / update-archive / update-archive.sh

diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index e7fbabd..126e727 100755 (executable)
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -1,6 +1,13 @@
 #!/bin/sh
-if test ! -f apt-ftparchive.conf.in; then
-       echo "$0: apt-ftparchive.conf.in must be located in current directory"
+D0=`dirname $0`
+confdir=`cd $D0; pwd`
+
+if test ! -f ${confdir}/apt-ftparchive.conf.in; then
+       echo "$0: ${condir}/apt-ftparchive.conf.in not found"
+       exit 1
+fi
+if test ! -f ${confdir}/apt-release.conf.in; then
+       echo "$0: ${condir}/apt-release.conf.in not found"
        exit 1
 fi
 
@@ -11,14 +18,16 @@ fi
 
 # gpg -a -d -o Release.gpg Release
 
-confdir=`pwd`
 
 architectures="i386 amd64"
 
-for vdist in ubuntu/karmic ubuntu/lucid ubuntu/maverick \
-       ubuntu/natty ubuntu/oneiric ubuntu/precise \
-       debian/wheezy debian/squeeze debian/lenny \
-       debian/etch; do
+if [ "$1" == "" ]; then 
+       DISTRIBUTIONS="ubuntu/lucid ubuntu/natty ubuntu/oneiric ubuntu/precise ubuntu/quantal debian/wheezy debian/squeeze debian/lenny"
+else
+       DISTRIBUTIONS=$1
+fi
+
+for vdist in $DISTRIBUTIONS ; do
        dist=`basename $vdist`
        vendor=`dirname $vdist`
        ftpdir=/home/ftp/pub/$vendor
@@ -108,7 +117,7 @@ for vdist in ubuntu/karmic ubuntu/lucid ubuntu/maverick \
                sed "s/@sections@/${sections}/g" > $F
        # Don't know if clean is needed!
        # apt-ftparchive clean apt-ftparchive.conf
-       apt-ftparchive generate apt-ftparchive.conf
+       apt-ftparchive generate apt-ftparchive.conf 2>&1
        echo "Done generate $dist: $sections"
 
        # release