Remove deprecated methods for passing additional options to install code. (#12943)
Austin S. Hemmelgarn committed
Dec 7, 2022 at 11:03 UTC
f198f3f383f742b185f0782fe7570bc816fe87a0
1 file changed
+3
-8
packaging/installer/kickstart.sh
+3
-8
@@ -2,7 +2,7 @@
2
#
3
# SPDX-License-Identifier: GPL-3.0-or-later
4
#
5
-# Next unused error code: F050D
5
+# Next unused error code: F050F
6
7
# ======================================================================
8
# Constants
@@ -46,6 +46,7 @@ NETDATA_CLAIM_ONLY=0
46
NETDATA_CLAIM_URL="api.netdata.cloud"
47
NETDATA_COMMAND="default"
48
NETDATA_DISABLE_CLOUD=0
49
+NETDATA_INSTALLER_OPTIONS=""
50
NETDATA_ONLY_BUILD=0
51
NETDATA_ONLY_NATIVE=0
52
NETDATA_ONLY_STATIC=0
@@ -63,7 +64,6 @@ else
64
fi
65
66
NETDATA_TARBALL_BASEURL="${NETDATA_TARBALL_BASEURL:-https://storage.googleapis.com/netdata-nightlies}"
66
-NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS:-""}"
67
TELEMETRY_API_KEY="${NETDATA_POSTHOG_API_KEY:-mqkwGT0JNFqO-zX2t0mW6Tec9yooaVu7xCBlXtHnt5Y}"
68
69
if echo "${0}" | grep -q 'kickstart-static64'; then
@@ -2088,10 +2088,6 @@ validate_args() {
2088
}
2089
2090
parse_args() {
2091
- if [ -n "${NETDATA_INSTALLER_OPTIONS}" ]; then
2092
- warning "Explicitly specifying additional installer options with NETDATA_INSTALLER_OPTIONS is deprecated. Please instead pass the options to the script using either --local-build-options or --static-install-options as appropriate."
2093
- fi
2094
-
2091
while [ -n "${1}" ]; do
2092
case "${1}" in
2093
"--help")
@@ -2249,8 +2245,7 @@ parse_args() {
2245
fi
2246
;;
2247
*)
2252
- warning "Passing unrecognized option '${1}' to installer script. This behavior is deprecated and will be removed in the near future. If you intended to pass this option to the installer code, please use either --local-build-options or --static-install-options to specify it instead."
2253
- NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS} ${1}"
2248
+ fatal "Unrecognized option '${1}'. If you intended to pass this option to the installer code, please use either --local-build-options or --static-install-options to specify it instead." F050E
2249
;;
2250
esac
2251
shift 1