From: Joerg Jaspert Date: Thu, 20 Jan 2011 22:17:04 +0000 (+0100) Subject: win32-loader autobyhand X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e05647e6e601f442fa04572abf00949c8edbbbf6;p=dak win32-loader autobyhand fix dak.conf by closing }; the entry. use proper set statements use scriptvars and later on $ftpdir instead of writing full path drop error() function, only used once. proper indentation change target path to build a win32-loader/$SUITE tree so different suites can have different installer for win32 remove unused trap - and call to undefined function cleanup. Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 27561517..0a3e70c6 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -362,6 +362,7 @@ AutomaticByHandPackages { Source "win32-loader"; Section "byhand"; Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-win32-loader"; + }; }; Dir diff --git a/scripts/debian/byhand-win32-loader b/scripts/debian/byhand-win32-loader index e9d70856..2a4abf1b 100755 --- a/scripts/debian/byhand-win32-loader +++ b/scripts/debian/byhand-win32-loader @@ -1,37 +1,39 @@ -#!/bin/sh -ue +#!/bin/sh + +set -u +set -e if [ $# -lt 4 ]; then echo "Usage: $0 filename version arch changes_file" exit 1 fi +export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars +. $SCRIPTVARS + WIN32_LOADER_FILE="$1" # *-win32-loader{.exe,txt} VERSION="$2" ARCH="$3" CHANGES="$4" # Changes file for the upload -error() { - echo "$*" - exit 1 -} - # Get the target suite from the Changes file # NOTE: it may be better to pass this to the script as a parameter! SUITE="$(grep "^Distribution:" "$CHANGES" | awk '{print $2}')" case $SUITE in "") - error "Error: unable to determine suite from Changes file" - ;; + echo "Error: unable to determine suite from Changes file" + exit 1 + ;; unstable|sid) - : # nothing to do - ;; + : # nothing to do + ;; *) - SUITE="${SUITE}-proposed-updates" - ;; + SUITE="${SUITE}-proposed-updates" + ;; esac # This must end with / -TARGET="/srv/ftp-master.debian.org/ftp/tools/" +TARGET="${ftpdir}/tools/win32-loader/${SUITE}/" # Check validity of the target directory if [ ! -d "$TARGET" ]; then @@ -41,7 +43,4 @@ fi # Put said file into the tools directory cp "$WIN32_LOADER_FILE" "$TARGET" -trap - EXIT -cleanup - exit 0