[X2Go-Commits] [buildscripts] 02/05: bin/sbuild-deb-package: quoting changes only.

[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 23dae321627ef5a8cb1b6e695200e34da4d74a55
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Aug 17 15:44:48 2018 +0200

    bin/sbuild-deb-package: quoting changes only.
---
 bin/sbuild-deb-package | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index a96ddc5..19461ad 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -332,14 +332,14 @@ build_packages() {
 				cd "${PROJECT_DIR}"
 				git clone --no-hardlinks --no-local "${PROJECT_DIR}" "${TEMP_DIR}/${PROJECT}/"
 				cd "${TEMP_DIR}/${PROJECT}"
-				git checkout "${CHECKOUT}" || git checkout master
+				git checkout "${CHECKOUT}" || git checkout 'master'
 				find "${PROJECT_DIR}/../" -maxdepth 0 -mindepth 0 -type f | grep -qs "${PROJECT}_"*.orig.tar.gz && cp -- "${PROJECT_DIR}/../${PROJECT}_"*.orig.tar.gz ..
 				GITREV="$(gitrevno)"
 
 				# we always build native packages for our repos
 				SA_OPTION=""
 				test -f "debian/source/format" && grep -Eqs '^3.0.*\(quilt\)$' "debian/source/format" && {
-					git fetch origin upstream:upstream || true
+					git fetch 'origin' 'upstream:upstream' || true
 					# Short explanation for replacing tilde characters with underscores:
 					# Yes, they are legit characters in a version string, but that's where the fun ends.
 					# Since we expect the non-modified version to be available as a branch called "upstream/#{UPSTREAM_VERSION}"
@@ -348,16 +348,16 @@ build_packages() {
 					# underscore character, because that sounds most sensible (keeps the string length intact
 					# and actually shows the substitution to observant readers).
 					#                                                                                    ┌ remove epoch  ┌ remove debian rev ┌ replace tilde characters with underscores
-					UPSTREAM_VERSION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/^.*://' -e 's/-[^-]*$//' -e 's/~/_/g')"
-					REVISION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/.*-//')"
+					UPSTREAM_VERSION="$(dpkg-parsechangelog | grep 'Version:' | cut -d ' ' -f2 | sed -e 's/^.*://' -e 's/-[^-]*$//' -e 's/~/_/g')"
+					REVISION="$(dpkg-parsechangelog | grep 'Version:' | cut -d ' ' -f2 | sed -e 's/.*-//')"
 
 					# Before actually running git archive, we'd better fetch the branch first, in case it's new.
 					# Failures to do so are fatal now.
 					git fetch origin "refs/heads/upstream/${UPSTREAM_VERSION}:refs/heads/upstream/${UPSTREAM_VERSION}"
 
 					git archive --prefix="${PROJECT}-${UPSTREAM_VERSION}/" -o "../${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz" "upstream/${UPSTREAM_VERSION}" && {
-						SA_OPTION="--debbuildopts=-sa"
-					} || echo "1.0" > "debian/source/format"
+						SA_OPTION='--debbuildopts=-sa'
+					} || echo '1.0' > "debian/source/format"
 				}
 
 				if [ -n "${BASH_VERSINFO[0]}" ] && [ "${BASH_VERSINFO[0]}" -gt 3 ]; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git