[X2Go-Commits] [buildscripts] 03/26: bin/build-{deb, rpm}-package: backport from bin/sbuild-deb-package: rename ${COMPONENT_MAIN} to ${COMPONENT_RELEASE}.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 9671e72e9fe649df5e1469ef22500b96ee150b04
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 13 18:58:33 2016 +0100

    bin/build-{deb,rpm}-package: backport from bin/sbuild-deb-package: rename ${COMPONENT_MAIN} to ${COMPONENT_RELEASE}.
---
 bin/build-deb-package |   12 ++++++------
 bin/build-rpm-package |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 61fe04e..33eae0f 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -30,7 +30,7 @@ DEB_DISTS_SUPPORTED="debian ubuntu"
 DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,stretch,sid"
 UBUNTU_DISTROS="lucid,precise"
 
-COMPONENT_MAIN="main"
+COMPONENT_RELEASE="main"
 COMPONENT_NIGHTLY="nightly"
 COMPONENT_BUNDLES="bundle-release1 bundle-release2"
 REPOS_SERVER="packages.mydomain.org"
@@ -93,9 +93,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_MAIN}" ]; then
+	if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ]; then
 		CHECKOUT="${3:-build-main}"
-	elif [ "x${COMPONENT}" = "x${COMPONENT_MAIN}-test" ]; then
+	elif [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ]; then
 		CHECKOUT="${3:-build-main-test}"
 	elif grep -qs "$COMPONENT" <<< "${COMPONENT_RELEASES}"; then
 		CHECKOUT="${3:-build-$COMPONENT}"
@@ -294,8 +294,8 @@ build_packages() {
 					exit 1
 				fi
 
-				# modify the section for non-main package builds
-				[ "x${COMPONENT}" != "xmain" ] && {
+				# modify the section for non-release package builds
+				[ "x${COMPONENT}" != "x${COMPONENT_RELEASE}" ] && {
 					mv -- "debian/control" "debian/control.tmp"
 					sed "s,Section:[\ ]*\(.*\),Section: ${COMPONENT}/\1,g" debian/control.tmp > debian/control
 				}
@@ -309,7 +309,7 @@ build_packages() {
 				mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/"{amd64,i386}
 				OTHERMIRROR=""
 				if [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then
-					grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_MAIN} ${COMPONENT}"
+					grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_RELEASE} ${COMPONENT}"
 				else
 					grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT}"
 				fi
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 0150295..bc6791f 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -145,9 +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_MAIN}" ]; then
+	if [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}" ]; then
 		CHECKOUT="${3:-build-main}"
-	elif [ "x${COMPONENT}" = "x${COMPONENT_MAIN}-test" ]; then
+	elif [ "x${COMPONENT}" = "x${COMPONENT_RELEASE}-test" ]; then
 		CHECKOUT="${3:-build-main-test}"
 		COMPONENT="maintest"
 	elif grep -qs "${COMPONENT}" <<< "${COMPONENT_RELEASES}"; then

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git