diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-11-07 12:22:44 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-11-07 12:22:44 +0000 |
| commit | 1e6c93250172946eeb38e94a92a1fd12c9d3011e (patch) | |
| tree | 8ca5e16dfc7ad6b3bf2738ca0a48408a950f8f7e /contrib/rhel | |
| parent | Update watch file (diff) | |
| download | netdata-1e6c93250172946eeb38e94a92a1fd12c9d3011e.tar.xz netdata-1e6c93250172946eeb38e94a92a1fd12c9d3011e.zip | |
Merging upstream version 1.11.0+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'contrib/rhel')
| -rwxr-xr-x | contrib/rhel/build-netdata-rpm.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh index 051969091..927318fb1 100755 --- a/contrib/rhel/build-netdata-rpm.sh +++ b/contrib/rhel/build-netdata-rpm.sh @@ -3,12 +3,13 @@ # docker run -it --rm centos:6.9 /bin/sh # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel -cd $(dirname $0)/../../ || exit 1 +cd "$(dirname "$0")/../../" || exit 1 +# shellcheck disable=SC1091 source "installer/functions.sh" || exit 1 set -e -run ./autogen.sh +run autoreconf -ivf run ./configure --enable-maintainer-mode run make dist @@ -27,7 +28,7 @@ then fi srpm=$(run rpmbuild -ts "${tgz}" | cut -d ' ' -f 2) -if [ -z "${srpm}" -o ! -f "${srpm}" ] +if [ -z "${srpm}" ] || [ ! -f "${srpm}" ] then echo >&2 "Cannot find the generated SRPM file '${srpm}'" exit 1 |