test-subrepo-recursion: more aggressively regex 'unzip -l' output for 10.10
The output on 10.10 looks like this:
Length Date Time Name
-------- ---- ---- ----
172 01-01-80 00:00 .hg_archival.txt
10 01-01-80 00:00 .hgsub
45 01-01-80 00:00 .hgsubstate
3 01-01-80 00:00 x.txt
10 01-01-80 00:00 foo/.hgsub
45 01-01-80 00:00 foo/.hgsubstate
9 01-01-80 00:00 foo/y.txt
9 01-01-80 00:00 foo/bar/z.txt
-------- -------
303 8 files
(2 digit year, shorter -- separators and closer columns). We don't care about
any of that, so ignore it.
#!/bin/bash -eu
. $(dirname $0)/dockerlib.sh
. $(dirname $0)/packagelib.sh
BUILDDIR=$(dirname $0)
export ROOTDIR=$(cd $BUILDDIR/..; pwd)
checkdocker
PLATFORM="debian-$1"
shift # extra params are passed to build process
initcontainer $PLATFORM
DEBBUILDDIR=$ROOTDIR/packages/$PLATFORM
contrib/builddeb --debbuilddir $DEBBUILDDIR/staged --prepare
DSHARED=/mnt/shared/
if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $DEBBUILDDIR:$DSHARED -v $PWD:/mnt/hg $CONTAINER \
sh -c "cd /mnt/hg && make clean && make local"
fi
$DOCKER run -u $DBUILDUSER --rm -v $DEBBUILDDIR:$DSHARED -v $PWD:/mnt/hg $CONTAINER \
sh -c "cd /mnt/hg && make PREFIX=$DSHARED/staged/usr install"
$DOCKER run -u $DBUILDUSER --rm -v $DEBBUILDDIR:$DSHARED $CONTAINER \
dpkg-deb --build $DSHARED/staged
if [ $(uname) = "Darwin" ] ; then
$DOCKER run -u $DBUILDUSER --rm -v $DEBBUILDDIR:$DSHARED -v $PWD:/mnt/hg $CONTAINER \
sh -c "cd /mnt/hg && make clean"
fi
gethgversion
rm -r $DEBBUILDDIR/staged
mv $DEBBUILDDIR/staged.deb $DEBBUILDDIR/mercurial-$version-$release.deb
echo
echo "Build complete - results can be found in $DEBBUILDDIR"