From 105ad30a29266eafedd8ef79bc21218b92415907 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 12 Apr 2021 18:30:45 +0200 Subject: Merging upstream version 1.30.1. Signed-off-by: Daniel Baumann --- contrib/debian/install_go.sh | 2 +- contrib/rhel/build-netdata-rpm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib') diff --git a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh index 22ff691f9..4c4ee9394 100755 --- a/contrib/debian/install_go.sh +++ b/contrib/debian/install_go.sh @@ -7,7 +7,7 @@ LIBEXEC_DIR="$3" # ############################################################ # Package Go within netdata (TBD: Package it separately) 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/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh index 9ce3863b9..e48c3c17c 100755 --- a/contrib/rhel/build-netdata-rpm.sh +++ b/contrib/rhel/build-netdata-rpm.sh @@ -25,7 +25,7 @@ if [[ "${version//-/}" != "$version" ]]; then # Append the current datetime fox a 'unique' build versionfix+="_$(date '+%m%d%H%M%S')" # And issue hints & details on why this failed, and how to fix it - run_failed "Current version contains '-' which is fobidden by rpm. You must create a git annotated tag and rerun this script. Exemple:" + run_failed "Current version contains '-' which is forbidden by rpm. You must create a git annotated tag and rerun this script. Example:" run_failed " git tag -a $versionfix -m 'Release by $(id -nu) on $(uname -n)' && $0" exit 1 fi -- cgit v1.2.3