run shfmt on CI scripts (#4928)
[netdata release candidate]
Paweł Krupa committed
Dec 6, 2018 at 10:22 UTC
16929d4172138b8ea016845b24e41897775149c0
3 files changed
+23
-24
.travis/create_artifacts.sh
+7
-10
@@ -1,10 +1,9 @@
1
#!/bin/bash
2
# shellcheck disable=SC2230
3
4
-if [ ! -f .gitignore ]
5
-then
6
- echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
7
- exit 1
4
+if [ ! -f .gitignore ]; then
5
+ echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
6
+ exit 1
7
fi
8
9
# Make sure stdout is in blocking mode. If we don't, then conda create will barf during downloads.
@@ -20,14 +19,12 @@ echo "--- Create self-extractor ---"
19
echo "--- Create checksums ---"
20
GIT_TAG=$(git tag --points-at)
21
if [ "${GIT_TAG}" != "" ]; then
23
- ln -s netdata-latest.gz.run "netdata-${GIT_TAG}.gz.run"
24
- ln -s netdata-*.tar.gz "netdata-${GIT_TAG}.tar.gz"
25
- sha256sum -b "netdata-${GIT_TAG}.gz.run" "netdata-${GIT_TAG}.tar.gz" > "sha256sums.txt"
22
+ ln -s netdata-latest.gz.run "netdata-${GIT_TAG}.gz.run"
23
+ ln -s netdata-*.tar.gz "netdata-${GIT_TAG}.tar.gz"
24
+ sha256sum -b "netdata-${GIT_TAG}.gz.run" "netdata-${GIT_TAG}.tar.gz" >"sha256sums.txt"
25
else
27
- sha256sum -b ./*.tar.gz ./*.gz.run > "sha256sums.txt"
26
+ sha256sum -b ./*.tar.gz ./*.gz.run >"sha256sums.txt"
27
fi
28
29
echo "checksums:"
30
cat sha256sums.txt
32
-
33
-
.travis/generate_changelog.sh
+10
-11
@@ -2,10 +2,9 @@
2
3
set -e
4
5
-if [ ! -f .gitignore ]
6
-then
7
- echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
8
- exit 1
5
+if [ ! -f .gitignore ]; then
6
+ echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
7
+ exit 1
8
fi
9
10
COMMIT_AND_PUSH=${COMMIT_AND_PUSH:-0}
@@ -29,13 +28,13 @@ git checkout master
28
git pull
29
#docker run -it --rm -v "$(pwd)":/usr/local/src/your-app ferrarimarco/github-changelog-generator:1.14.3 \
30
docker run -it -v "$(pwd)":/project markmandel/github-changelog-generator:latest \
32
- --user "${ORGANIZATION}" \
33
- --project "${PROJECT}" \
34
- --token "${GITHUB_TOKEN}" \
35
- --since-tag "v1.10.0" \
36
- --unreleased-label "**Next release**" \
37
- --exclude-labels "stale,duplicate,question,invalid,wontfix,discussion,no changelog" \
38
- --no-compare-link ${OPTS}
31
+ --user "${ORGANIZATION}" \
32
+ --project "${PROJECT}" \
33
+ --token "${GITHUB_TOKEN}" \
34
+ --since-tag "v1.10.0" \
35
+ --unreleased-label "**Next release**" \
36
+ --exclude-labels "stale,duplicate,question,invalid,wontfix,discussion,no changelog" \
37
+ --no-compare-link ${OPTS}
38
39
echo "--- Uploading changelog ---"
40
git add CHANGELOG.md
.travis/tagger.sh
+6
-3
@@ -24,7 +24,7 @@ fi
24
25
# Embed new version in files which need it.
26
# This wouldn't be needed if we could use `git tag` everywhere.
27
-function embed_version {
27
+function embed_version() {
28
VERSION="$1"
29
MAJOR=$(echo "$GIT_TAG" | cut -d . -f 1 | cut -d v -f 2)
30
MINOR=$(echo "$GIT_TAG" | cut -d . -f 2)
@@ -37,7 +37,7 @@ function embed_version {
37
38
# Figure out what will be new release candidate tag based only on previous ones.
39
# This assumes that RELEASES are in format of "v0.1.2" and prereleases (RCs) are using "v0.1.2-rc0"
40
-function release_candidate {
40
+function release_candidate() {
41
LAST_TAG=$(git semver)
42
if [[ $LAST_TAG =~ -rc* ]]; then
43
VERSION=$(echo "$LAST_TAG" | cut -d'-' -f 1)
@@ -62,7 +62,10 @@ if [ -z "${GIT_TAG}" ]; then
62
*"[netdata minor release]"*) GIT_TAG="v$(git semver --next-minor)" ;;
63
*"[netdata major release]"*) GIT_TAG="v$(git semver --next-major)" ;;
64
*"[netdata release candidate]"*) release_candidate ;;
65
- *) echo "Keyword not detected. Exiting..."; exit 0;;
65
+ *)
66
+ echo "Keyword not detected. Exiting..."
67
+ exit 0
68
+ ;;
69
esac
70
fi
71
embed_version "$GIT_TAG"