diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-05-12 14:21:24 +0200 |
|---|---|---|
| committer | X2go Administrator <x2go-admin@ymir.das-netzwerkteam.de> | 2011-05-12 14:21:38 +0200 |
| commit | 72291e96e4b6949de94d4969bcef5476e04cec18 (patch) | |
| tree | 13d0cf6a438d659851f3bf6da8dde1f79cab3dcf | |
| parent | 03ffe48df2ef557c7b3432cc3881185f22b512ee (diff) | |
| download | buildscripts-72291e96e4b6949de94d4969bcef5476e04cec18.tar.gz buildscripts-72291e96e4b6949de94d4969bcef5476e04cec18.tar.bz2 buildscripts-72291e96e4b6949de94d4969bcef5476e04cec18.zip | |
fixes CODENAME based package building
| -rwxr-xr-x | bin/x2go-buildpackage | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/x2go-buildpackage b/bin/x2go-buildpackage index 17aa3ff..a6643a8 100755 --- a/bin/x2go-buildpackage +++ b/bin/x2go-buildpackage @@ -32,8 +32,8 @@ set_vars() { # grab repository component area from command line (2nd argv) or guess it ARGV2_COMPONENT=$(echo $2 | cut -d"/" -f1) ARGV2_CODENAME=$(echo $2 | cut -d"/" -f2) - COMPONENT=${$ARGV2_COMPONENT:-${COMPONENT:-heuler}} - CODENAMES=${$ARGV2_CODENAME:-${CODENAME_ONLY:-sid}} + COMPONENT=${ARGV2_COMPONENT:-${COMPONENT:-heuler}} + CODENAMES=${ARGV2_CODENAME:-${CODENAME_ONLY:-sid}} if [ "x$COMPONENT" = "xmain" ]; then CHECKOUT=${3:-build-main} elif [ "x$COMPONENT" = "xheuler" ]; then @@ -111,7 +111,7 @@ build_packages() { # use pbuilder for building all variants of this package cat BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) - CODENAMES=${$CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} + CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} echo "$DIST_SUPPORTED" | grep $l_DIST >/dev/null && { for l_CODENAME in $CODENAMES; do TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" @@ -166,7 +166,7 @@ upload_packages() { cd $PKGDIST cat $PROJECT_DIR/BUILDS_FOR | egrep -v '(^$|^#.*$)' | while read line; do l_DIST=$(echo $line | cut -d":" -f1 | tr [A-Z] [a-z]) - CODENAMES=$(echo $line | cut -d":" -f2- | tr [A-Z] [a-z]) + CODENAMES=${CODENAMES:-$(echo $line | cut -d":" -f2- | tr [A-Z] [a#-z])} for l_CODENAME in $CODENAMES; do for l_ARCH in amd64 i386; do cd $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH |