X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=update-archive%2Fupdate-archive.sh;h=f00cd5ddb61cf613ef0c9fe58e723945a7ccd3ab;hb=8e440590328583759dcf42fefdc1f96ec989ca57;hp=a7988eacf93cf73701e87792e56cd034892ab99a;hpb=a356496599c4e94cf31e780f52787c446e0fe204;p=git-tools-moved-to-github.git

diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index a7988ea..f00cd5d 100755
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -1,91 +1,197 @@
 #!/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
+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 ! -x /usr/bin/apt-ftparchive; then
-	echo "$0: /usr/bin/apt-ftparchive missing. Install apt-utils"
+if test ! -f ${confdir}/apt-ftparchive.conf.in; then
+	echo "$0: ${condir}/apt-ftparchive.conf.in not found"
 	exit 1
 fi
-
-if test -z "$1"; then
-	debiandir=/home/ftp/pub/debian
-else
-	debiandir=$1
+if test ! -f ${confdir}/apt-release.conf.in; then
+	echo "$0: ${condir}/apt-release.conf.in not found"
+	exit 1
 fi
 
-if test ! -d "$debiandir"; then
-	echo "$0: The specified '$debiandir' is not a directory"
+if test ! -x /usr/bin/apt-ftparchive; then
+	echo "$0: /usr/bin/apt-ftparchive missing. Install apt-utils"
 	exit 1
 fi
 
-
 # gpg -a -d -o Release.gpg Release
+	
+architectures="i386 amd64"
 
-confdir=`pwd`
-cd $debiandir
-
-# Uncomment to clean the .db (cache)
-# rm ${debiandir}/tmp/*
+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 ubuntu/raring ubuntu/saucy ubuntu/trusty debian/jessie debian/wheezy debian/squeeze debian/lenny"
 
-for dist in lenny etch sarge woody; do
-	# Make symlinks from the regular FTP archive
-	d=pool/dists/$dist
-	if test ! -d $d; then mkdir -p $d; fi
-	for l in $d/*; do
-		if test -L $l; then
-			if test -f $l; then
-				:
-			else
-				rm $l
+if test -z "$DISTRIBUTIONS"; then
+	DISTRIBUTIONS=$ALLD
+else
+	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
-	# ln -sf /home/ftp/pub/*/debian/$dist/* $d
-	mkdir -p $d/source
-	ln -sf /home/ftp/pub/*/debian/$dist/* $d/source
-	rm $d/source/*.deb
-	for arch in $architectures; do
-		mkdir -p $d/${arch}
-		ln -sf /home/ftp/pub/*/debian/$dist/*_${arch}.* $d/${arch}
-		ln -sf /home/ftp/pub/*/debian/$dist/*_all.* $d/${arch}
-	done
+fi
 
- 	# ${confdir}/symclean.sh $d
+echo "DISTRIBUTIONS=$DISTRIBUTIONS"
+for vdist in $DISTRIBUTIONS ; do
+	dist=`basename $vdist`
+	vendor=`dirname $vdist`
+	ftpdir=/home/ftp/pub/$vendor
+	if test ! -d $ftpdir; then
+		echo "$ftpdir does not exist"
+		exit 1
+	fi
+	cd $ftpdir
+	test -d tmp || mkdir tmp
+	# Uncomment to clean the .db (cache)
+	if $clear; then
+		rm tmp/*
+	fi
 
-	for arch in $architectures; do
-		d=dists/$dist/main/binary-$arch
+	sections=""
+	for section in main restricted; do
+		# Prepare pool
+		d=pool/dists/$dist/$section
 		if test ! -d $d; then mkdir -p $d; fi
-        	echo "Archive: $dist" >$d/Release
-        	echo 'Component: main' >>$d/Release
-        	echo 'Origin: Indexdata' >>$d/Release
-        	echo "Architecture: $arch" >>$d/Release
-	done
-
-	d=dists/$dist/main/source
-	if test ! -d $d; then mkdir -p $d; fi
-        echo "Archive: $dist" >$d/Release
-        echo 'Component: main' >>$d/Release
-        echo 'Origin: Indexdata' >>$d/Release
-        echo 'Architecture: source' >>$d/Release
+		mkdir -p $d/source
+		# Remove invalid symlinks (source, i386, amd64,..)
+		for l in $d/*/*; do
+			if test -L "$l"; then
+				if test ! -f "$l"; then
+					rm $l
+				fi
+			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
+				use=true
+			fi
+			if test ! -f $pdir/.htaccess -a $section = "main"; then
+				use=true
+			fi
+			if $use; then
+				distdir=$pdir/$vendor/$dist
+				if test -d $distdir; then
+					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 \
+							$distdir/*_${arch}.* \
+							$distdir/*_all.*; do
+						    if test -f $f; then
+							    ln -sf $f $d/${arch}
+				    			    has_packages=true
+						    fi
+						done
+					done
+				fi
+			fi
+		done
 
+		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: 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"
+	apt-ftparchive generate apt-ftparchive.conf 2>&1
+	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