summaryrefslogtreecommitdiffstats
path: root/netdata-installer.sh
diff options
context:
space:
mode:
authorEmmanuel Vasilakis <mrzammler@mm.st>2021-08-24 17:56:03 +0300
committerGitHub <noreply@github.com>2021-08-24 17:56:03 +0300
commitf71c7a3a5b0fa74c7c1184e50b075fe28e5dff37 (patch)
tree466f13ed3d154b515e9cf2c80d8f51c8ba8e4e04 /netdata-installer.sh
parent90adda052d63fee60e4544e947bb25f82bcdda7b (diff)
Check for failed protobuf configure or make (#11450)
* check for failed protobuf configure or make * revert error instead of warn
Diffstat (limited to 'netdata-installer.sh')
-rwxr-xr-xnetdata-installer.sh15
1 files changed, 10 insertions, 5 deletions
diff --git a/netdata-installer.sh b/netdata-installer.sh
index 900cb15d53..e73da64d30 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -738,11 +738,16 @@ build_protobuf() {
fi
pushd "${1}" > /dev/null || return 1
- run ${env_cmd} ./configure --disable-shared \
- --without-zlib \
- --disable-dependency-tracking \
- --with-pic || return 1
- run ${env_cmd} ${make} -j$(find_processors) || return 1
+ if ! run ${env_cmd} ./configure --disable-shared --without-zlib --disable-dependency-tracking --with-pic; then
+ popd > /dev/null || return 1
+ return 1
+ fi
+
+ if ! run ${env_cmd} $make -j$(find_processors); then
+ popd > /dev/null || return 1
+ return 1
+ fi
+
popd > /dev/null || return 1
}