diff options
Diffstat (limited to 'packaging/installer')
| -rw-r--r-- | packaging/installer/functions.sh | 4 | ||||
| -rwxr-xr-x | packaging/installer/install-required-packages.sh | 10 | ||||
| -rwxr-xr-x | packaging/installer/kickstart-static64.sh | 4 | ||||
| -rwxr-xr-x | packaging/installer/kickstart.sh | 4 | ||||
| -rw-r--r-- | packaging/installer/methods/kickstart-64.md | 2 | ||||
| -rw-r--r-- | packaging/installer/methods/kickstart.md | 2 | ||||
| -rwxr-xr-x | packaging/installer/netdata-uninstaller.sh | 2 | ||||
| -rwxr-xr-x | packaging/installer/netdata-updater.sh | 26 |
8 files changed, 27 insertions, 27 deletions
diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh index 03ceb2a5..fd10fcfa 100644 --- a/packaging/installer/functions.sh +++ b/packaging/installer/functions.sh @@ -760,7 +760,7 @@ create_netdata_conf() { run_ok "New configuration saved for you to edit at ${path}" else [ -f "${path}.new" ] && rm "${path}.new" - run_failed "Cannnot download configuration from netdata daemon using url '${url}'" + run_failed "Cannot download configuration from netdata daemon using url '${url}'" url='' fi fi @@ -891,7 +891,7 @@ portable_add_user_to_group() { } safe_sha256sum() { - # Within the contexct of the installer, we only use -c option that is common between the two commands + # Within the context of the installer, we only use -c option that is common between the two commands # We will have to reconsider if we start non-common options if command -v sha256sum > /dev/null 2>&1; then sha256sum "$@" diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 23cbe12d..203f7c6c 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -141,7 +141,7 @@ EOF release2lsb_release() { # loads the given /etc/x-release file - # this file is normaly a single line containing something like + # this file is normally a single line containing something like # # X Linux release 1.2.3 (release-name) # @@ -322,8 +322,8 @@ user_picks_distribution() { echo >&2 "I found though that the following installers are available:" echo >&2 [ -n "${apt_get}" ] && echo >&2 " - Debian/Ubuntu based (installer is: apt-get)" && opts="apt-get ${opts}" - [ -n "${yum}" ] && echo >&2 " - Redhat/Fedora/Centos based (installer is: yum)" && opts="yum ${opts}" - [ -n "${dnf}" ] && echo >&2 " - Redhat/Fedora/Centos based (installer is: dnf)" && opts="dnf ${opts}" + [ -n "${yum}" ] && echo >&2 " - Red Hat/Fedora/CentOS based (installer is: yum)" && opts="yum ${opts}" + [ -n "${dnf}" ] && echo >&2 " - Red Hat/Fedora/CentOS based (installer is: dnf)" && opts="dnf ${opts}" [ -n "${zypper}" ] && echo >&2 " - SuSe based (installer is: zypper)" && opts="zypper ${opts}" [ -n "${pacman}" ] && echo >&2 " - Arch Linux based (installer is: pacman)" && opts="pacman ${opts}" [ -n "${emerge}" ] && echo >&2 " - Gentoo based (installer is: emerge)" && opts="emerge ${opts}" @@ -1265,7 +1265,7 @@ suitable_package() { return 0 elif [ -z "${p}" ]; then echo >&2 "WARNING" - echo >&2 "package ${1} is not availabe in this system." + echo >&2 "package ${1} is not available in this system." echo >&2 return 1 else @@ -1492,7 +1492,7 @@ install_apt_get() { prompt() { if [ "${NON_INTERACTIVE}" -eq 1 ]; then echo >&2 "Running in non-interactive mode, assuming yes (y)" - echo >&2 " > Would have promptedfor ${1} ..." + echo >&2 " > Would have prompted for ${1} ..." return 0 fi diff --git a/packaging/installer/kickstart-static64.sh b/packaging/installer/kickstart-static64.sh index a86a62fc..36aca54d 100755 --- a/packaging/installer/kickstart-static64.sh +++ b/packaging/installer/kickstart-static64.sh @@ -151,7 +151,7 @@ create_tmp_directory() { if _cannot_use_tmpdir /tmp ; then if _cannot_use_tmpdir "${PWD}" ; then echo >&2 - 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." + echo >&2 "Unable to find a usable temporary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." exit 1 else TMPDIR="${PWD}" @@ -283,7 +283,7 @@ while [ -n "${1}" ]; do done if [ ! "${DO_NOT_TRACK:-0}" -eq 0 ] || [ -n "$DO_NOT_TRACK" ]; then - NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS:+${NETDATA_INSTALLER_OPTIONS} }--disable-telemtry" + NETDATA_INSTALLER_OPTIONS="${NETDATA_INSTALLER_OPTIONS:+${NETDATA_INSTALLER_OPTIONS} }--disable-telemetry" fi if [ -n "${NETDATA_DISABLE_CLOUD}" ]; then diff --git a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh index bd18b7db..3c90cc81 100755 --- a/packaging/installer/kickstart.sh +++ b/packaging/installer/kickstart.sh @@ -183,7 +183,7 @@ create_tmp_directory() { if _cannot_use_tmpdir /tmp ; then if _cannot_use_tmpdir "${PWD}" ; then echo >&2 - 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." + echo >&2 "Unable to find a usable temporary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." exit 1 else TMPDIR="${PWD}" @@ -293,7 +293,7 @@ dependencies() { } safe_sha256sum() { - # Within the contexct of the installer, we only use -c option that is common between the two commands + # Within the context of the installer, we only use -c option that is common between the two commands # We will have to reconsider if we start non-common options if command -v sha256sum > /dev/null 2>&1; then sha256sum "$@" diff --git a/packaging/installer/methods/kickstart-64.md b/packaging/installer/methods/kickstart-64.md index dbb0cd46..ea6cf32e 100644 --- a/packaging/installer/methods/kickstart-64.md +++ b/packaging/installer/methods/kickstart-64.md @@ -77,7 +77,7 @@ To use `md5sum` to verify the integrity of the `kickstart-static64.sh` script yo command above, run the following: ```bash -[ "33ed36d80c7db0e501b68c4c0c3ceb02" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" +[ "c735fd724be5726c8a1850deed2793b8" = "$(curl -Ss https://my-netdata.io/kickstart-static64.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" ``` If the script is valid, this command will return `OK, VALID`. diff --git a/packaging/installer/methods/kickstart.md b/packaging/installer/methods/kickstart.md index 8ad99dc4..0fc09ae8 100644 --- a/packaging/installer/methods/kickstart.md +++ b/packaging/installer/methods/kickstart.md @@ -60,7 +60,7 @@ To use `md5sum` to verify the integrity of the `kickstart.sh` script you will do run the following: ```bash -[ "35e92cd3fd8a29621e23962ac5626dfc" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" +[ "a708de3790fa39188babe71eb1639c66" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID" ``` If the script is valid, this command will return `OK, VALID`. diff --git a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh index f62934f7..a248860d 100755 --- a/packaging/installer/netdata-uninstaller.sh +++ b/packaging/installer/netdata-uninstaller.sh @@ -14,7 +14,7 @@ usage="$(basename "$0") [-h] [-f ] -- program to calculate the answer to life, the universe and everything where: - -e, --env path to environment file (defauls to '/etc/netdata/.environment' + -e, --env path to environment file (defaults to '/etc/netdata/.environment' -f, --force force uninstallation and do not ask any questions -h show this help text -y, --yes flag needs to be set to proceed with uninstallation" diff --git a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh index 2b833d79..ad741225 100755 --- a/packaging/installer/netdata-updater.sh +++ b/packaging/installer/netdata-updater.sh @@ -65,7 +65,7 @@ if [ "${ENVIRONMENT_FILE}" == "THIS_SHOULD_BE_REPLACED_BY_INSTALLER_SCRIPT" ]; t fi safe_sha256sum() { - # Within the contexct of the installer, we only use -c option that is common between the two commands + # Within the context of the installer, we only use -c option that is common between the two commands # We will have to reconsider if we start non-common options if command -v sha256sum > /dev/null 2>&1; then sha256sum "$@" @@ -123,7 +123,7 @@ create_tmp_directory() { if _cannot_use_tmpdir /tmp ; then if _cannot_use_tmpdir "${PWD}" ; then echo >&2 - 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." + echo >&2 "Unable to find a usable temporary directory. Please set \$TMPDIR to a path that is both writable and allows execution of files and try again." exit 1 else TMPDIR="${PWD}" @@ -215,7 +215,7 @@ parse_version() { r="${1}" if echo "${r}" | grep -q '^v.*'; then # shellcheck disable=SC2001 - # XXX: Need a regex group subsitutation here. + # XXX: Need a regex group substitution here. r="$(echo "${r}" | sed -e 's/^v\(.*\)/\1/')" fi @@ -234,13 +234,11 @@ parse_version() { } get_latest_version() { - local latest if [ "${RELEASE_CHANNEL}" == "stable" ]; then - latest="$(download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4)" + download "https://api.github.com/repos/netdata/netdata/releases/latest" /dev/stdout | grep tag_name | cut -d'"' -f4 else - latest="$(download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout)" + download "$NETDATA_NIGHTLIES_BASEURL/latest-version.txt" /dev/stdout fi - parse_version "$latest" } set_tarball_urls() { @@ -272,7 +270,9 @@ update() { download "${NETDATA_TARBALL_CHECKSUM_URL}" "${ndtmpdir}/sha256sum.txt" >&3 2>&3 current_version="$(command -v netdata > /dev/null && parse_version "$(netdata -v | cut -f 2 -d ' ')")" - latest_version="$(get_latest_version)" + latest_tag="$(get_latest_version)" + latest_version="$(parse_version "${latest_tag}")" + path_version="$(echo "${latest_tag}" | cut -f 1 -d "-")" # If we can't get the current version for some reason assume `0` current_version="${current_version:-0}" @@ -295,9 +295,9 @@ update() { NEW_CHECKSUM="$(safe_sha256sum netdata-latest.tar.gz 2> /dev/null | cut -d' ' -f1)" tar -xf netdata-latest.tar.gz >&3 2>&3 rm netdata-latest.tar.gz >&3 2>&3 - cd netdata-* || exit 1 + cd "$(find . -maxdepth 1 -name "netdata-${path_version}*" | head -n 1)" || exit 1 RUN_INSTALLER=1 - cd "${NETDATA_LOCAL_TARBAL_OVERRIDE}" || exit 1 + cd "${NETDATA_LOCAL_TARBALL_OVERRIDE}" || exit 1 fi # We got the sources, run the update now @@ -362,7 +362,7 @@ while [ -n "${1}" ]; do fi done -# Random sleep to aileviate stampede effect of Agents upgrading +# Random sleep to alleviate stampede effect of Agents upgrading # and disconnecting/reconnecting at the same time (or near to). # But only we're not a controlling terminal (tty) # Randomly sleep between 1s and 60m @@ -376,7 +376,7 @@ source "${ENVIRONMENT_FILE}" || exit 1 # We dont expect to find lib dir variable on older installations, so load this path if none found export NETDATA_LIB_DIR="${NETDATA_LIB_DIR:-${NETDATA_PREFIX}/var/lib/netdata}" -# Source the tarbal checksum, if not already available from environment (for existing installations with the old logic) +# Source the tarball checksum, if not already available from environment (for existing installations with the old logic) [[ -z "${NETDATA_TARBALL_CHECKSUM}" ]] && [[ -f ${NETDATA_LIB_DIR}/netdata.tarball.checksum ]] && NETDATA_TARBALL_CHECKSUM="$(cat "${NETDATA_LIB_DIR}/netdata.tarball.checksum")" # Grab the nightlies baseurl (defaulting to our Google Storage bucket) @@ -412,7 +412,7 @@ if [ "${IS_NETDATA_STATIC_BINARY}" == "yes" ]; then download "${NETDATA_TARBALL_CHECKSUM_URL}" "${ndtmpdir}/sha256sum.txt" download "${NETDATA_TARBALL_URL}" "${ndtmpdir}/netdata-latest.gz.run" if ! grep netdata-latest.gz.run "${ndtmpdir}/sha256sum.txt" | safe_sha256sum -c - > /dev/null 2>&1; then - fatal "Static binary checksum validation failed. Stopping netdata installation and leaving binary in ${ndtmpdir}\nUsually this is a result of an older copy of the file being cached somehere and can be resolved by simply retrying in an hour." + fatal "Static binary checksum validation failed. Stopping netdata installation and leaving binary in ${ndtmpdir}\nUsually this is a result of an older copy of the file being cached somewhere and can be resolved by simply retrying in an hour." fi # Do not pass any options other than the accept, for now |