X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=update-archive%2Fupdate-archive.sh;h=126e72760659c59aaa347483e8b54cb761509a42;hb=f78f45173e539bbd9d469efc5b08f0fae1edb6fe;hp=1cec276ec6d663c579790284cac71f7051f6454c;hpb=45708c48adcb3e2b9b9f74732b166d05b440b6b8;p=git-tools-moved-to-github.git

diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index 1cec276..126e727 100755
--- 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,7 +18,6 @@ fi
 
 # gpg -a -d -o Release.gpg Release
 
-confdir=`pwd`
 
 architectures="i386 amd64"
 
@@ -111,7 +117,7 @@ for vdist in $DISTRIBUTIONS ; do
 		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