Fixes a bug in DO_NOT_TRACK expression (#7929)
* Fixed bug in DO_NOT_TRACK expression * Fix kickstart-static64 checksum in docs. Co-authored-by: Austin S. Hemmelgarn <ahferroin7@gmail.com>
James Mills committed
Jan 31, 2020 at 22:52 UTC
c47e7aac52246c0748f0e4c1b31d54641da3464e
6 files changed
+6
-6
daemon/anonymous-statistics.sh.in
+1
-1
@@ -18,7 +18,7 @@ ACTION_DATA=$(echo "${ACTION_DATA}" | tr '"' "'")
18
# -------------------------------------------------------------------------------------------------
19
# check opt-out
20
21
-if [ -f "@configdir_POST@/.opt-out-from-anonymous-statistics" ] || [ ! "$DO_NOT_TRACK" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
21
+if [ -f "@configdir_POST@/.opt-out-from-anonymous-statistics" ] || [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
22
exit 0
23
fi
24
netdata-installer.sh
+1
-1
@@ -888,7 +888,7 @@ install_go
888
# -----------------------------------------------------------------------------
889
progress "Telemetry configuration"
890
891
-if [ ! "$DO_NOT_TRACK" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
891
+if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
892
NETDATA_DISABLE_TELEMETRY=1
893
fi
894
packaging/docker/run.sh
+1
-1
@@ -7,7 +7,7 @@
7
# Author : Pavlos Emm. Katsoulakis <paul@netdata.cloud>
8
set -e
9
10
-if [ ! "$DO_NOT_TRACK" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
10
+if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
11
touch /etc/netdata/.opt-out-from-anonymous-statistics
12
fi
13
packaging/installer/kickstart-static64.sh
+1
-1
@@ -231,7 +231,7 @@ while [ -n "${1}" ]; do
231
fi
232
done
233
234
-if [ ! "$DO_NOT_TRACK" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
234
+if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
235
NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS:+${NETDATA_INSTALLER_OPTIONS} }--disable-telemtry"
236
fi
237
packaging/installer/methods/kickstart-64.md
+1
-1
@@ -68,7 +68,7 @@ To use `md5sum` to verify the intregity of the `kickstart-static64.sh` script yo
68
command above, run the following:
69
70
```bash
71
-[ "788cfe179615158331877a577c140486" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
71
+[ "33ecd20452f569c1d9972bcefdf04692" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
72
```
73
74
If the script is valid, this command will return `OK, VALID`.
packaging/makeself/install-or-update.sh
+1
-1
@@ -57,7 +57,7 @@ while [ "${1}" ]; do
57
shift 1
58
done
59
60
-if [ ! "$DO_NOT_TRACK" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
60
+if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then
61
REINSTALL_OPTIONS="${REINSTALL_OPTIONS} --disable-telemtry"
62
fi
63