diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-12 16:30:45 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-12 16:30:45 +0000 |
| commit | 105ad30a29266eafedd8ef79bc21218b92415907 (patch) | |
| tree | ca61c4aec3a3feceef50a88e5d125bbb2621ad3a /contrib | |
| parent | Releasing debian version 1.30.0-1. (diff) | |
| download | netdata-105ad30a29266eafedd8ef79bc21218b92415907.tar.xz netdata-105ad30a29266eafedd8ef79bc21218b92415907.zip | |
Merging upstream version 1.30.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/debian/install_go.sh | 2 | ||||
| -rwxr-xr-x | contrib/rhel/build-netdata-rpm.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh index 22ff691f..4c4ee939 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 9ce3863b..e48c3c17 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 |