From: Mark Hymers <mhy@debian.org>
Date: Wed, 7 Jul 2010 17:24:31 +0000 (+0000)
Subject: Support +b[0-9] versions in autobyhand for di
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=2067a6b0b90ccc79e286bc7989a7c28d7cd3e394

Support +b[0-9] versions in autobyhand for di

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 70faceb6..ab01536d 100755
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -16,8 +16,8 @@ error() {
 }
 
 # Check validity of version number
-# Expected are: YYYYMMDD, YYYYMMDD.x, YYYYMMDD<suite>x
-if ! echo "$VERSION" | grep -Eq "^[0-9]{8}(|(\.|[a-z]+)[0-9]+)$"; then
+# Expected are: YYYYMMDD, YYYYMMDD.x, YYYYMMDD<suite>x and the +b[0-9] on the end
+if ! echo "$VERSION" | grep -Eq "^[0-9]{8}(|(\.|[a-z]+)[0-9]+)(\+b[0-9])?$"; then
 	error "Invalid version: '$VERSION'"
 fi
 
@@ -50,10 +50,13 @@ if [ -d "$TARGET/$VERSION" ]; then
 	error "Directory already exists: $TARGET/$VERSION"
 fi
 
+# We know the VERSION is sane by here, we just need to make sure we escape the + in +b1 (if any)
+VERSIONREGEXP="$(echo $VERSION | sed 's@+@\\\+@')"
+
 # We know all data to be in ./installer-<arch>/<version>; see if there's
 # anything else in the tarball except that and the 'current' symlink
 if tar tzf "$TARBALL" | \
-   grep -Eqv "^\./(installer-$ARCH/($VERSION/.*|current|)|)$"; then
+   grep -Eqv "^\./(installer-$ARCH/($VERSIONREGEXP/.*|current|)|)$"; then
 	error "Tarball contains unexpected contents"
 fi