[X2Go-Commits] [buildscripts] 02/26: bin/build-{deb, rpm}-package: move some variable settings to the more-appropriate function.

[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 5fc5da0205d72099617f06bb606669c0ec032573
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 13 08:53:05 2016 +0100

    bin/build-{deb,rpm}-package: move some variable settings to the more-appropriate function.
---
 bin/build-deb-package |   17 +++++++++--------
 bin/build-rpm-package |   15 ++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index cd307de..61fe04e 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -123,6 +123,15 @@ set_vars() {
 	mkdir -p -- "${PROJECT_DIR}"
 	mkdir -p -- "${PKGDIST}"
 
+	# by default we build for all current debian versions
+	if [ "x${ARGV2_CODENAME}" != "x" ]; then
+		if grep -qs "${ARGV2_CODENAME}" <<< "${DEBIAN_DISTROS}"; then
+			DEB_BUILD_FOR="debian:${ARGV2_CODENAME}"
+		elif grep -qs "${ARGV2_CODENAME}" <<< "${UBUNTU_DISTROS}"; then
+			DEB_BUILD_FOR="ubuntu:${ARGV2_CODENAME}"
+		fi
+	fi
+
 	return 0
 }
 
@@ -151,14 +160,6 @@ prepare_workspace() {
 	GIT_OBJECT_ID="$(git rev-parse --verify HEAD)"
 	cd "${PROJECT_DIR}"
 
-	# by default we build for all current debian versions
-	if [ "x${ARGV2_CODENAME}" != "x" ]; then
-		if grep -qs "${ARGV2_CODENAME}" <<< "${DEBIAN_DISTROS}"; then
-			DEB_BUILD_FOR="debian:${ARGV2_CODENAME}"
-		elif grep -qs "${ARGV2_CODENAME}" <<< "${UBUNTU_DISTROS}"; then
-			DEB_BUILD_FOR="ubuntu:${ARGV2_CODENAME}"
-		fi
-	fi
 	return 0
 }
 
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 7764622..0150295 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -172,6 +172,14 @@ set_vars() {
 	mkdir -p -- "${PROJECT_DIR}"
 	mkdir -p -- "${PKGDIST}"
 
+	if [ "x${ARGV2_CODENAME}" != "x" ]; then
+		if grep -qs "${ARGV2_CODENAME}" <<< "${FEDORA_DISTROS}"; then
+			RPM_BUILD_FOR="fedora:${ARGV2_CODENAME}"
+		elif grep -qs "${ARGV2_CODENAME}" <<< "${EPEL_DISTROS}"; then
+			RPM_BUILD_FOR="epel:${ARGV2_CODENAME}"
+		fi
+	fi
+
 	return 0
 }
 
@@ -588,13 +596,6 @@ prepare_workspace() {
 	GIT_OBJECT_ID="$(git rev-parse --verify HEAD)"
 	cd "${PROJECT_DIR}"
 
-	if [ "x${ARGV2_CODENAME}" != "x" ]; then
-		if grep -qs "${ARGV2_CODENAME}" <<< "${FEDORA_DISTROS}"; then
-			RPM_BUILD_FOR="fedora:${ARGV2_CODENAME}"
-		elif grep -qs "${ARGV2_CODENAME}" <<< "${EPEL_DISTROS}"; then
-			RPM_BUILD_FOR="epel:${ARGV2_CODENAME}"
-		fi
-	fi
 	return 0
 }
 

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