X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=update-archive%2Fupdate-archive.sh;h=e7fbabdf0538dfa7761209c2a51632f38305d03f;hb=6d159ce7a02e7f3c550c14380ff8fa96addfa639;hp=6f96c0988f9043e832bb14ac6ddd9bdcd5766a24;hpb=c4520d6e7ab8959a5d2dd7333cbd3ad11578ea72;p=git-tools-moved-to-github.git

diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index 6f96c09..e7fbabd 100755
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: update-archive.sh,v 1.13 2008-10-20 10:24:15 adam Exp $
 if test ! -f apt-ftparchive.conf.in; then
 	echo "$0: apt-ftparchive.conf.in must be located in current directory"
 	exit 1
@@ -16,7 +15,10 @@ confdir=`pwd`
 
 architectures="i386 amd64"
 
-for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karmic debian/squeeze debian/lenny debian/etch; do
+for vdist in ubuntu/karmic ubuntu/lucid ubuntu/maverick \
+	ubuntu/natty ubuntu/oneiric ubuntu/precise \
+	debian/wheezy debian/squeeze debian/lenny \
+	debian/etch; do
 	dist=`basename $vdist`
 	vendor=`dirname $vdist`
 	ftpdir=/home/ftp/pub/$vendor
@@ -29,6 +31,7 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 	# Uncomment to clean the .db (cache)
 	# rm tmp/*
 
+	sections=""
 	for section in main restricted; do
 		# Prepare pool
 		d=pool/dists/$dist/$section
@@ -43,6 +46,7 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 			fi
 		done
 		# Make symlinks from the regular FTP archive
+		has_packages=false
 		for pdir in /home/ftp/pub/*; do
 			use=false
 			if test -f $pdir/.htaccess -a $section != "main"; then
@@ -54,8 +58,9 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 			if $use; then
 				distdir=$pdir/$vendor/$dist
 				if test -d $distdir; then
-					ln -sf $distdir/*.dsc $d/source
-					ln -sf $distdir/*.gz $d/source
+					for f in $distdir/*.dsc $distdir/*.gz; do
+						test -f $f && ln -sf $f $d/source
+					done
 					for arch in $architectures; do
 						mkdir -p $d/${arch}
 						for f in $pdir/.htaccess \
@@ -63,6 +68,7 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 							$distdir/*_all.*; do
 						    if test -f $f; then
 							    ln -sf $f $d/${arch}
+				    			    has_packages=true
 						    fi
 						done
 					done
@@ -70,36 +76,47 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 			fi
 		done
 		# ${confdir}/symclean.sh $d
-		
-		for arch in $architectures; do
-			d=dists/$dist/$section/binary-$arch
+
+		rm -f $d/Release
+		if $has_packages; then
+			if test -z "$sections"; then
+				sections="$section"
+			else
+				sections="$sections $section"
+			fi
+			for arch in $architectures; do
+				d=dists/$dist/$section/binary-$arch
+				if test ! -d $d; then mkdir -p $d; fi
+				echo "Archive: $dist" >$d/Release
+				echo "Component: $section" >>$d/Release
+				echo 'Origin: Indexdata' >>$d/Release
+				echo "Architecture: $arch" >>$d/Release
+			done
+			d=dists/$dist/$section/source
 			if test ! -d $d; then mkdir -p $d; fi
 			echo "Archive: $dist" >$d/Release
 			echo "Component: $section" >>$d/Release
 			echo 'Origin: Indexdata' >>$d/Release
-			echo "Architecture: $arch" >>$d/Release
-		done
-		
-		d=dists/$dist/$section/source
-		if test ! -d $d; then mkdir -p $d; fi
-		echo "Archive: $dist" >$d/Release
-		echo "Component: $section" >>$d/Release
-		echo 'Origin: Indexdata' >>$d/Release
-		echo 'Architecture: source' >>$d/Release
+			echo 'Architecture: source' >>$d/Release
+		fi
 	done
 	# generate
-	echo "Begin Generate $dist"
+	echo "Begin Generate $dist: $sections"
 	F=apt-ftparchive.conf
-	sed "s/@dist@/$dist/g" <${confdir}/${F}.in |sed "s/@architectures@/${architectures}/g" > $F
+	sed "s/@dist@/$dist/g" <${confdir}/${F}.in | \
+		sed "s/@architectures@/${architectures}/g" | \
+		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
-	echo "Done generate $dist"
+	echo "Done generate $dist: $sections"
 
 	# release
 	r=dists/$dist/Release
 	F=apt-release.conf
-	sed "s/@dist@/$dist/g" <${confdir}/${F}.in | sed "s/@architectures@/${architectures}/g" >$F
+	sed "s/@dist@/$dist/g" <${confdir}/${F}.in | \
+		sed "s/@architectures@/${architectures}/g" | \
+		sed "s/@sections@/${sections}/g" > $F
 	# Move Release file away while calling using release 
 	rm $r
 	apt-ftparchive -c $F release dists/$dist >tmp_Release