[X2Go-Commits] [buildscripts] 01/01: bin/sbuild-deb-package: port sbuild options settings to bash arrays.

git-admin at x2go.org git-admin at x2go.org
Tue Nov 15 05:42:37 CET 2016


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 07546f1c0527715d3bc3b313ab89063c069b2d5f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Nov 15 05:42:33 2016 +0100

    bin/sbuild-deb-package: port sbuild options settings to bash arrays.
---
 bin/sbuild-deb-package |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 4dd0f2c..e9878b1 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -325,33 +325,35 @@ build_packages() {
 				# create git changelog immediately prior to building the package
 				git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog
 
-				SBUILD_OPTIONS="-n --jobs=2 -sAd ${codename} -k ${GPG_KEY} --build-dep-resolver=aptitude"
+				typeset -a sbuild_options
+				sbuild_options=("-n" "--jobs=2" "-sAd ${codename}" "-k ${GPG_KEY}" "--build-dep-resolver=aptitude")
 
 				if [ -n "${SA_OPTION}" ]; then
-					SBUILD_OPTIONS="${SBUILD_OPTIONS} ${SA_OPTION}"
+					sbuild_options+=("${SA_OPTION}")
 				fi
 
 				if [ -n "${OTHERMIRROR}" ]; then
-					SBUILD_OPTIONS="${SBUILD_OPTIONS} --extra-repository=\"${OTHERMIRROR}\""
+					sbuild_options+=("--extra-repository='${OTHERMIRROR}'")
 				fi
 
-				SBUILD_OPTIONS_64="${SBUILD_OPTIONS}"
-				SBUILD_OPTIONS_32="${SBUILD_OPTIONS} --arch=i386 --debbuildopts=\"-B\""
-				SBUILD_OPTIONS_ARMHF="${SBUILD_OPTIONS} --arch=armhf"
+				typeset -a sbuild_options_64 sbuild_options_32 sbuild_options_armhf
+				sbuild_options_64=("${sbuild_options[@]}")
+				sbuild_options_32=("${sbuild_options[@]}" "--arch=i386" "--debbuildopts=\"-B\"")
+				sbuild_options_armhf=("${sbuild_options[@]}" "--arch=armhf")
 
 				[ "${l_DIST}" = "raspbian" ] && {
 					[ "${SKIP_ARCH}" != "armhf" ] && grep -Eqs 'Architecture.*(all|any|armhf)' "${TEMP_DIR}/${PROJECT}/debian/control" && {
 						cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/armhf"
-						nice ${SBUILD} ${SBUILD_OPTIONS_ARMHF} "${PROJECT_DIR}"
+						nice ${SBUILD} "${sbuild_options_armhf[@]}" "${PROJECT_DIR}"
 					}
 				} || {
 					[ "x${SKIP_ARCH}" != "xamd64" ] && grep -Eqs 'Architecture.*(all|any|amd64)' "${TEMP_DIR}/${PROJECT}/debian/control" && {
 						cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/amd64"
-						nice ${SBUILD} ${SBUILD_OPTIONS_64} "${PROJECT_DIR}"
+						nice ${SBUILD} "${sbuild_options_64[@]}" "${PROJECT_DIR}"
 					}
 					[ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "${TEMP_DIR}/${PROJECT}/debian/control" && {
 						cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386"
-						nice ${SBUILD} ${SBUILD_OPTIONS_32} "${PROJECT_DIR}"
+						nice ${SBUILD} "${sbuild_options_32[@]}" "${PROJECT_DIR}"
 					}
 				}
 			done

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


More information about the x2go-commits mailing list