This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 6f9026f3847c2be57f7ccfeaa41204323f154b35 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 13 19:29:02 2016 +0100 bin/{{s,}build-deb,build-rpm}-package: simplify branch checkout logic a bit. --- bin/build-deb-package | 8 ++------ bin/build-rpm-package | 11 +++-------- bin/sbuild-deb-package | 8 ++------ 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index a37c056..8f89693 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -93,12 +93,8 @@ set_vars() { CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" [ -n "${ARGV2_CODENAME}" ] && FORCE_BUILD="yes" || true DATE="${DATE:-$(date +%Y%m%d)}" - if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ]; then - CHECKOUT="${3:-build-main}" - elif [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ]; then - CHECKOUT="${3:-build-main-test}" - elif grep -qs "$COMPONENT" <<< "${COMPONENT_RELEASES}"; then - CHECKOUT="${3:-build-$COMPONENT}" + if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ] || [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ] || grep -qs "$COMPONENT" <<< "${COMPONENT_RELEASES}"; then + CHECKOUT="${3:-build-${COMPONENT}}" elif [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then CHECKOUT="${3:-master}" else diff --git a/bin/build-rpm-package b/bin/build-rpm-package index bc6791f..890ae66 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -145,14 +145,9 @@ set_vars() { CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" [ -n "${ARGV2_CODENAME}" ] && FORCE_BUILD="yes" || true DATE="${DATE:-$(date +%Y%m%d)}" - if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ]; then - CHECKOUT="${3:-build-main}" - elif [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ]; then - CHECKOUT="${3:-build-main-test}" - COMPONENT="maintest" - elif grep -qs "${COMPONENT}" <<< "${COMPONENT_RELEASES}"; then - CHECKOUT="${3:-build-$COMPONENT}" - elif [ "x${COMPONENT}" = "x$COMPONENT_NIGHTLY" ]; then + if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ] || [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ] || grep -qs "$COMPONENT" <<< "${COMPONENT_RELEASES}"; then + CHECKOUT="${3:-build-${COMPONENT}}" + elif [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then CHECKOUT="${3:-master}" else echo "error: no such package component area for this Git project. Aborting..." diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 9bd3cbd..377f3fd 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -86,12 +86,8 @@ set_vars() { CODENAMES="${ARGV2_CODENAME:-${CODENAMES}}" [ -n "${ARGV2_CODENAME}" ] && FORCE_BUILD="yes" || true DATE="${DATE:-$(date +%Y%m%d)}" - if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ]; then - CHECKOUT="${3:-release-builds}" - elif [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ]; then - CHECKOUT="${3:-release-testbuilds}" - elif grep -qs "$COMPONENT" <<< "${COMPONENT_BUNDLES}"; then - CHECKOUT="${3:-build-$COMPONENT}" + if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ] || [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ] || grep -qs "$COMPONENT" <<< "${COMPONENT_RELEASES}"; then + CHECKOUT="${3:-build-${COMPONENT}}" elif [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then CHECKOUT="${3:-master}" else -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git