X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbyhand-di;h=af03af4c8f3d3bfb12fbeab67139ae3cedc90791;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=70faceb63cfec40a53a0089508729d258cc1be4a;hpb=26127c32273ec9aa520aff834993ebf5504dfdc1;p=dak.git

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 70faceb6..af03af4c 100755
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -1,4 +1,8 @@
-#!/bin/sh -ue
+#!/bin/bash
+
+set -u
+set -e
+set -o pipefail
 
 if [ $# -lt 4 ]; then
 	echo "Usage: $0 filename version arch changes_file"
@@ -16,8 +20,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, 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 +54,14 @@ 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)
+# It needs 'g' as well as we may have +$DIST+b[0-9]
+VERSIONREGEXP="$(echo $VERSION | sed 's@+@\\\+@g')"
+
 # 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