X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbyhand-di;h=99cb313152555496227c56f751cad15f8e66d9a8;hb=162d4038c842d7df4dbf1f95fe9bd05e0c8580e8;hp=0a004f3899956e22e4f0580dc2f56c126b945879;hpb=330833cdf958e43962e208f8021e0e44f1fc100c;p=dak.git

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 0a004f38..99cb3131 100755
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -1,4 +1,7 @@
-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
 
 if [ $# -lt 4 ]; then
 	echo "Usage: $0 filename version arch changes_file"
@@ -16,8 +19,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
 
@@ -37,7 +40,7 @@ case $SUITE in
 esac
 
 # This must end with /
-TARGET="/srv/ftp.debian.org/ftp/dists/$SUITE/main/installer-$ARCH/"
+TARGET="/srv/ftp-master.debian.org/ftp/dists/$SUITE/main/installer-$ARCH/"
 
 # Check validity of the target directory
 # This could fail, for example for new architectures; doing
@@ -50,10 +53,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
 
@@ -95,6 +101,10 @@ mv "$TMPDIR/installer-$ARCH/current"  "$TARGET"
 find "$TARGET/$VERSION" -type d -exec chmod 755 {} +
 find "$TARGET/$VERSION" -type f -exec chmod 644 {} +
 
+# Make sure nothing symlinks outside of the ftpdir
+# Shouldnt happen, but better be sure.
+symlinks -d -r /srv/ftp-master.debian.org/ftp
+
 trap - EXIT
 cleanup