[X2Go-Commits] [buildscripts] 14/26: bin/sbuild-deb-package: backport from bin/build-deb-package: make usage- and prefix-checks multiline.

git-admin at x2go.org git-admin at x2go.org
Sun Nov 13 20:35:46 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 1b061415fe23061ff01083a2b10e4f0366d08c75
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 13 19:41:59 2016 +0100

    bin/sbuild-deb-package: backport from bin/build-deb-package: make usage- and prefix-checks multiline.
---
 bin/sbuild-deb-package |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 377f3fd..27f2720 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -39,10 +39,18 @@ GNUPGHOME="${HOME}/.gnupg"
 
 TIMESTAMP=$(date +%s%N)
 
-test -z "${1}" && { echo "usage: $(basename "${0}") [<subpath>/]<git-project> {release,release/<codename>,nightly,nightly/<codename>} [<git-checkout>]"; exit 1; }
+test -z "${1}" && {
+	exec >&2
+	echo "usage: $(basename "${0}") [<subpath>/]<git-project> {main,main/<codename>,nightly,nightly/<codename>} [<git-checkout>]"
+	exit 1
+}
 
 PREFIX="$(cut -d"-" -f1 <<< "$(basename "${0}")")"
-test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || { echo "${0} has no valid context prefix..." >&2; exit 1; }
+test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PREFIX}.conf" || {
+	exec >&2
+	echo "${0} has no valid context prefix..."
+	exit 1;
+}
 
 : ${FORCE_BUILD:="no"}
 : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS}"}

--
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