[X2Go-Commits] [buildscripts] 01/01: bin/{build-{{deb, nsis, osx, rpm}-package, -package.sh}, sbuild-deb-package}: fix default value syntax, single quotes are not expanded/removed there either.

git-admin at x2go.org git-admin at x2go.org
Wed Feb 22 08:55:32 CET 2023


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 6ac4dc0d95d6c88f0bdd4b33ad50086fa7d4d5d3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 22 08:55:28 2023 +0100

    bin/{build-{{deb,nsis,osx,rpm}-package,-package.sh},sbuild-deb-package}: fix default value syntax, single quotes are not expanded/removed there either.
---
 bin/build-deb-package     | 2 +-
 bin/build-nsis-package.sh | 2 +-
 bin/build-osx-package     | 2 +-
 bin/build-rpm-package     | 8 ++++----
 bin/sbuild-deb-package    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 0584fa2..f6a8e62 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -106,7 +106,7 @@ set_vars() {
 
 	# This should typically be part of Jenkins's environment, but if we're
 	# building packages manually, provide a sane default.'
-	BUILD_NUMBER="${BUILD_NUMBER:-'0'}"
+	BUILD_NUMBER="${BUILD_NUMBER:-"0"}"
 
 	# setting paths
 	PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}"
diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh
index 4193d9b..1da3333 100755
--- a/bin/build-nsis-package.sh
+++ b/bin/build-nsis-package.sh
@@ -97,7 +97,7 @@ set_vars() {
 
 	# This should typically be part of Jenkins's environment, but if we're
 	# building packages manually, provide a sane default.'
-	BUILD_NUMBER="${BUILD_NUMBER:-'0'}"
+	BUILD_NUMBER="${BUILD_NUMBER:-"0"}"
 
 	# setting paths
 	: ${PROJECT_DIR:="/cygdrive/d/Build/GIT/nightly/${l_DIST}/${l_CODENAME}/x2goclient"}
diff --git a/bin/build-osx-package b/bin/build-osx-package
index b13875c..28069bd 100755
--- a/bin/build-osx-package
+++ b/bin/build-osx-package
@@ -108,7 +108,7 @@ set_vars() {
 
 	# This should typically be part of Jenkins's environment, but if we're
 	# building packages manually, provide a sane default.'
-	BUILD_NUMBER="${BUILD_NUMBER:-'0'}"
+	BUILD_NUMBER="${BUILD_NUMBER:-"0"}"
 
 	# setting paths
 	PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}"
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 7d57b29..fc7b682 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -62,10 +62,10 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE
 	exit 1
 }
 
-: "${NO_DELAY:='no'}"
-: "${FORCE_BUILD:='no'}"
+: "${NO_DELAY:="no"}"
+: "${FORCE_BUILD:="no"}"
 : "${RPM_BUILD_FOR:="fedora:${FEDORA_DISTROS} epel:${EPEL_DISTROS} opensuse:${OPENSUSE_DISTROS} sle:${SLE_DISTROS}"}"
-: "${PLATFORM:='x86'}"
+: "${PLATFORM:="x86"}"
 
 # These parts are not user-serviceable.
 TMP_MOCK_CFG_DIR=""
@@ -161,7 +161,7 @@ set_vars() {
 
 	# This should typically be part of Jenkins's environment, but if we're
 	# building packages manually, provide a sane default.'
-	BUILD_NUMBER="${BUILD_NUMBER:-'0'}"
+	BUILD_NUMBER="${BUILD_NUMBER:-"0"}"
 
 	# setting paths
 	PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}"
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 14de4df..b3f2887 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -109,7 +109,7 @@ set_vars() {
 
 	# This should typically be part of Jenkins's environment, but if we're
 	# building packages manually, provide a sane default.'
-	BUILD_NUMBER="${BUILD_NUMBER:-'0'}"
+	BUILD_NUMBER="${BUILD_NUMBER:-"0"}"
 
 	# setting paths
 	PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}"

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


More information about the x2go-commits mailing list