[X2Go-Commits] [buildscripts] 01/01: Use more consistent local variable names.

git-admin at x2go.org git-admin at x2go.org
Sat Apr 4 17:26:41 CEST 2015


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

x2go pushed a commit to branch feature/raspbian
in repository buildscripts.

commit c8066d2fc06e5b4347ba5f787ce3ca29f02532ab
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Apr 4 11:26:16 2015 -0400

    Use more consistent local variable names.
---
 bin/build-deb-package |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 88d731d..2632644 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -320,13 +320,13 @@ build_packages() {
 				[ "x${USE_SUDO}" != "xyes" ] && {
 					[ "x${EXTRA_ARCHS_ONLY}" = "x" ] && {
 						for arch in ${DEB_ARCHS_SUPPORTED}; do
-							if [[ "$arch" == "$DEB_PRIMARY_ARCH" ]]; then
-								[ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(all|any|${arch})" "debian/control" && {
-									DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --allow-untrusted ${SA_OPTION} 0<&-
+							if [[ "$l_ARCH" == "$DEB_PRIMARY_ARCH" ]]; then
+								[ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && grep -Eqs "Architecture.*(all|any|${l_ARCH})" "debian/control" && {
+									DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${l_ARCH}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -- --allow-untrusted ${SA_OPTION} 0<&-
 								}
 							else
-								[ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(any|${arch})" "debian/control" && {
-									DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&-
+								[ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && grep -Eqs "Architecture.*(any|${l_ARCH})" "debian/control" && {
+									DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${l_ARCH}" nice ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&-
 								}
 							fi
 						done
@@ -341,13 +341,13 @@ build_packages() {
 				[ "x${USE_SUDO}" = "xyes" ] && {
 					[ "x${EXTRA_ARCHS_ONLY}" = "x" ] && {
 						for arch in ${DEB_ARCHS_SUPPORTED}; do
-							if [[ "$arch" == "$DEB_PRIMARY_ARCH" ]]; then
-								[ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(all|any|${arch})" "debian/control" && {
-									nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --allow-untrusted ${SA_OPTION} 0<&-
+							if [[ "$l_ARCH" == "$DEB_PRIMARY_ARCH" ]]; then
+								[ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && grep -Eqs "Architecture.*(all|any|${l_ARCH})" "debian/control" && {
+									nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${l_ARCH}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -- --allow-untrusted ${SA_OPTION} 0<&-
 								}
 							else
-								[ "x${SKIP_ARCH}" != "x${arch}" ] && grep -Eqs "Architecture.*(any|${arch})" "debian/control" && {
-									nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${arch}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${arch}" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&-
+								[ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && grep -Eqs "Architecture.*(any|${l_ARCH})" "debian/control" && {
+									nice sudo GNUPGHOME="${GNUPGHOME}" DIST="${l_DIST}" CODENAME="${l_CODENAME}" ARCH="${l_ARCH}" OTHERMIRROR="${OTHERMIRROR}" ${PDEBUILD} --auto-debsign --debsign-k "${GPG_KEY}" --buildresult "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" -- --binary-arch --allow-untrusted ${SA_OPTION} 0<&-
 								}
 							fi
 						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