From 7551d501d229bffd157ec67636b225a3443a2d20 Mon Sep 17 00:00:00 2001
From: Simon Piette <simon.piette@savoirfairelinux.com>
Date: Wed, 17 Sep 2014 15:09:11 -0400
Subject: [PATCH] build-system: output error on stderr
Refs #55333
Change-Id: Ic031c907e87ff45735102707cd31e9463a9b5095
---
tools/build-system/build_tarball.sh | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/tools/build-system/build_tarball.sh b/tools/build-system/build_tarball.sh
index 535a186ce5..d34e2b6b6c 100755
--- a/tools/build-system/build_tarball.sh
+++ b/tools/build-system/build_tarball.sh
@@ -1,6 +1,7 @@
#!/bin/bash
#
# Script to build the source tarball for distribution on sflphone.org
+# Inclusion of KDE is a requirement. Run get-kde.sh to have it.
#
# Author: Francois Marier <francois@debian.org>
@@ -12,21 +13,26 @@ set -o errexit
cd ${WORKSPACE}
if [ ! -e daemon/configure.ac ] ; then
- echo "This script must be run in the root directory of the sflphone repository"
+ echo "This script must be run in the root directory of the sflphone repository" >&2
exit 1
fi
if [ $# -ne 1 ] ; then
- echo "Usage: $(basename $0) SOFTWARE_VERSION_NUMBER"
+ echo "Usage: $(basename $0) SOFTWARE_VERSION_NUMBER" >&2
exit 2
fi
+if [ ! -d kde ] ; then
+ echo 'No "kde" directory. Make sure get-kde.sh ran at some point.' >&2
+ exit 1
+fi
+
# Use the version fed by launch-build-machine-jenkins.sh
SOFTWARE_VERSION=$1
BUILDDIR=sflphone-$SOFTWARE_VERSION
if [ -e $BUILDDIR ] ; then
- echo "The build directory ($BUILDDIR) already exists. Delete it first."
+ echo "The build directory ($BUILDDIR) already exists. Delete it first." >&2
exit 3
fi
--
GitLab