From e7aaffce554c4af3597eca41ddf87ef26c236123 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sun, 12 Feb 2012 15:07:02 +0000 Subject: [PATCH] byhand-tag: do not rely on a entry for the directory in the tarball --- scripts/debian/byhand-tag | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/debian/byhand-tag b/scripts/debian/byhand-tag index 8dfa17a6..3e21f025 100755 --- a/scripts/debian/byhand-tag +++ b/scripts/debian/byhand-tag @@ -16,7 +16,7 @@ CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Tag[[:space:]]+[a-z0-9:. ,{}+-]+$' TARGET=/srv/ftp-master.debian.org/scripts/external-overrides/ # Read the main directory from the tarball -DIR="`tar ztf \"$INPUT\" | tac | tail -n 1`" +DIR="`tar ztf \"$INPUT\" | tail -n 1 | cut -d/ -f1`" # Create temporary files where to store the validated data umask 002 @@ -33,9 +33,9 @@ cleanup() { trap cleanup EXIT # Extract the data into the temporary files -tar -O -zxf "$INPUT" "$DIR"tag | grep -E "$CHECKRE" > "$OUTMAIN" -tar -O -zxf "$INPUT" "$DIR"tag.contrib | grep -E "$CHECKRE" > "$OUTCONTRIB" -tar -O -zxf "$INPUT" "$DIR"tag.non-free | grep -E "$CHECKRE" > "$OUTNONFREE" +tar -O -zxf "$INPUT" "$DIR"/tag | grep -E "$CHECKRE" > "$OUTMAIN" +tar -O -zxf "$INPUT" "$DIR"/tag.contrib | grep -E "$CHECKRE" > "$OUTCONTRIB" +tar -O -zxf "$INPUT" "$DIR"/tag.non-free | grep -E "$CHECKRE" > "$OUTNONFREE" # Move the data to the final location mv "$OUTMAIN" "$TARGET"tag -- 2.39.2