From: Mark Hymers 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/?a=commitdiff_plain;h=12de1d813df0d66d6c8034d2e5c6b7b58777b65a;p=dak.git Support +b[0-9] versions in autobyhand for di Signed-off-by: Mark Hymers --- 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, YYYYMMDDx -if ! echo "$VERSION" | grep -Eq "^[0-9]{8}(|(\.|[a-z]+)[0-9]+)$"; then +# Expected are: YYYYMMDD, YYYYMMDD.x, YYYYMMDDx 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-/; 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