Fixed typo in option name used to use bundled libJudy (#9893)
James Mills committed
Sep 8, 2020 at 20:59 UTC
4a5bb11ada67c5fcb78fae115a33f657a637d5ea
2 files changed
+20
-20
netdata-installer.sh
+19
-19
@@ -48,13 +48,13 @@ _cannot_use_tmpdir() {
48
testfile="$(TMPDIR="${1}" mktemp -q -t netdata-test.XXXXXXXXXX)"
49
ret=0
50
51
- if [ -z "${testfile}" ] ; then
51
+ if [ -z "${testfile}" ]; then
52
return "${ret}"
53
fi
54
55
- if printf '#!/bin/sh\necho SUCCESS\n' > "${testfile}" ; then
56
- if chmod +x "${testfile}" ; then
57
- if [ "$("${testfile}")" = "SUCCESS" ] ; then
55
+ if printf '#!/bin/sh\necho SUCCESS\n' > "${testfile}"; then
56
+ if chmod +x "${testfile}"; then
57
+ if [ "$("${testfile}")" = "SUCCESS" ]; then
58
ret=1
59
fi
60
fi
@@ -64,9 +64,9 @@ _cannot_use_tmpdir() {
64
return "${ret}"
65
}
66
67
-if [ -z "${TMPDIR}" ] || _cannot_use_tmpdir "${TMPDIR}" ; then
68
- if _cannot_use_tmpdir /tmp ; then
69
- if _cannot_use_tmpdir "${PWD}" ; then
67
+if [ -z "${TMPDIR}" ] || _cannot_use_tmpdir "${TMPDIR}"; then
68
+ if _cannot_use_tmpdir /tmp; then
69
+ if _cannot_use_tmpdir "${PWD}"; then
70
echo >&2
71
echo >&2 "Unable to find a usable temprorary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again."
72
exit 1
@@ -684,14 +684,14 @@ build_judy() {
684
fi
685
686
pushd "${1}" > /dev/null || return 1
687
- if run ${env_cmd} libtoolize --force --copy && \
688
- run ${env_cmd} aclocal && \
689
- run ${env_cmd} autoheader && \
690
- run ${env_cmd} automake --add-missing --force --copy --include-deps && \
691
- run ${env_cmd} autoconf && \
692
- run ${env_cmd} ./configure && \
693
- run ${env_cmd} make -C src && \
694
- run ${env_cmd} ar -r src/libJudy.a src/Judy*/*.o ; then
687
+ if run ${env_cmd} libtoolize --force --copy &&
688
+ run ${env_cmd} aclocal &&
689
+ run ${env_cmd} autoheader &&
690
+ run ${env_cmd} automake --add-missing --force --copy --include-deps &&
691
+ run ${env_cmd} autoconf &&
692
+ run ${env_cmd} ./configure &&
693
+ run ${env_cmd} make -C src &&
694
+ run ${env_cmd} ar -r src/libJudy.a src/Judy*/*.o; then
695
popd > /dev/null || return 1
696
else
697
popd > /dev/null || return 1
@@ -711,11 +711,11 @@ copy_judy() {
711
bundle_judy() {
712
# If --build-judy flag or no Judy on the system and we're building the dbengine, bundle our own libJudy.
713
# shellcheck disable=SC2235
714
- if [ -n "${NETDATA_DISABLE_DBENGINE}" ] || ( [ -z "${NETDATA_BUILD_JUDY}" ] && [ -e /usr/include/Judy.h ] ); then
714
+ if [ -n "${NETDATA_DISABLE_DBENGINE}" ] || ([ -z "${NETDATA_BUILD_JUDY}" ] && [ -e /usr/include/Judy.h ]); then
715
return 0
716
- elif [ -n "${NETDATA_BUILD_JUDY}" ] ; then
716
+ elif [ -n "${NETDATA_BUILD_JUDY}" ]; then
717
progress "User requested bundling of libJudy, building it now"
718
- elif [ ! -e /usr/include/Judy.h ] ; then
718
+ elif [ ! -e /usr/include/Judy.h ]; then
719
progress "/usr/include/Judy.h does not exist, but we need libJudy, building our own copy"
720
fi
721
@@ -736,7 +736,7 @@ bundle_judy() {
736
copy_judy "${tmp}/libjudy-${JUDY_PACKAGE_VERSION}" &&
737
rm -rf "${tmp}"; then
738
run_ok "libJudy built and prepared."
739
- NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS} --with-libjudy=externaldeps/libJudy"
739
+ NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS} --with-libJudy=externaldeps/libJudy"
740
else
741
run_failed "Failed to build libJudy."
742
if [ -n "${NETDATA_BUILD_JUDY}" ]; then
netdata.spec.in
+1
-1
@@ -263,7 +263,7 @@ export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging
263
autoreconf -ivf
264
%configure \
265
%if 0%{!?fedora:1} && 0%{!?suse_version:1}
266
- --with-libjudy=externaldeps/libJudy
266
+ --with-libJudy=externaldeps/libJudy
267
%endif
268
--prefix="%{_prefix}" \
269
--sysconfdir="%{_sysconfdir}" \