Skip to content

Commit 38402f3

Browse files
moskybmoskyb
committed
Fix shellcheck errors in shell scripts in this repo
1 parent 8b7c8fc commit 38402f3

21 files changed

+91
-48
lines changed

‎.buildkite/steps/build-github-release.sh‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ set -e
33

44
echo '--- Getting agent version from build meta data'
55

6-
export FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
7-
export AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
8-
export BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
6+
FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
7+
export FULL_AGENT_VERSION
8+
9+
AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
10+
export AGENT_VERSION
11+
12+
BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
13+
export BUILD_VERSION
914

1015
echo "Full agent version: $FULL_AGENT_VERSION"
1116
echo "Agent version: $AGENT_VERSION"
@@ -20,7 +25,7 @@ buildkite-agent artifact download "pkg/*" .
2025
function build() {
2126
echo "--- Building release for: $1"
2227

23-
./scripts/build-github-release.sh $1 $AGENT_VERSION
28+
./scripts/build-github-release.sh "$1" "$AGENT_VERSION"
2429
}
2530

2631
# Export the function so we can use it in xargs
@@ -30,4 +35,4 @@ export -f build
3035
rm -rf releases
3136

3237
# Loop over all the binaries and build them
33-
ls pkg/* | xargs -I {} bash -c "build {}"
38+
find pkg/* -print0 | xargs -I {} bash -c "build {}"

‎.buildkite/steps/build-rpm-packages.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ set -euo pipefail
33

44
echo "--- Getting agent version from build meta data"
55

6-
export FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
7-
export AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
8-
export BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
6+
FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
7+
export FULL_AGENT_VERSION
8+
9+
AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
10+
export AGENT_VERSION
11+
12+
BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
13+
export BUILD_VERSION
914

1015
echo "Full agent version: $FULL_AGENT_VERSION"
1116
echo "Agent version: $AGENT_VERSION"

‎.buildkite/steps/github-release.sh‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ dry_run() {
1010
}
1111

1212
echo '--- Getting credentials from SSM'
13-
export GITHUB_RELEASE_ACCESS_TOKEN=$(aws ssm get-parameter --name /pipelines/agent/GITHUB_RELEASE_ACCESS_TOKEN --with-decryption --output text --query Parameter.Value --region us-east-1)
13+
GITHUB_RELEASE_ACCESS_TOKEN=$(aws ssm get-parameter --name /pipelines/agent/GITHUB_RELEASE_ACCESS_TOKEN --with-decryption --output text --query Parameter.Value --region us-east-1)
14+
export GITHUB_RELEASE_ACCESS_TOKEN
1415

1516
if [[ "$GITHUB_RELEASE_ACCESS_TOKEN" == "" ]]; then
1617
echo "Error: Missing \$GITHUB_RELEASE_ACCESS_TOKEN"
@@ -19,10 +20,17 @@ fi
1920

2021
echo '--- Getting agent version from build meta data'
2122

22-
export FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
23-
export AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
24-
export BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
25-
export IS_PRERELEASE=$(buildkite-agent meta-data get "agent-is-prerelease")
23+
FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
24+
export FULL_AGENT_VERSION
25+
26+
AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
27+
export AGENT_VERSION
28+
29+
BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
30+
export BUILD_VERSION
31+
32+
IS_PRERELEASE=$(buildkite-agent meta-data get "agent-is-prerelease")
33+
export IS_PRERELEASE
2634

2735
echo "Full agent version: $FULL_AGENT_VERSION"
2836
echo "Agent version: $AGENT_VERSION"

‎.buildkite/steps/publish-debian-package.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ if ! findmnt --source tmpfs --target /root/.gnupg; then
2424
fi
2525

2626
echo "fetching signing key..."
27-
export GPG_SIGNING_KEY=$(aws ssm get-parameter --name /pipelines/agent/GPG_SIGNING_KEY --with-decryption --output text --query Parameter.Value --region us-east-1)
27+
GPG_SIGNING_KEY=$(aws ssm get-parameter --name /pipelines/agent/GPG_SIGNING_KEY --with-decryption --output text --query Parameter.Value --region us-east-1)
28+
export GPG_SIGNING_KEY
2829

2930
echo "fetching secret key..."
3031
aws ssm get-parameter --name /pipelines/agent/GPG_SECRET_KEY_ASCII --with-decryption --output text --query Parameter.Value --region us-east-1 > ${secret_key_path}

‎.buildkite/steps/publish-debian-packagecloud.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ echo "--- Installing dependencies"
3232
gem install package_cloud
3333

3434
echo "--- Requesting OIDC token"
35-
export PACKAGECLOUD_TOKEN="$(buildkite-agent oidc request-token --audience "https://packagecloud.io/${REPOSITORY}" --lifetime 300)"
35+
PACKAGECLOUD_TOKEN="$(buildkite-agent oidc request-token --audience "https://packagecloud.io/${REPOSITORY}" --lifetime 300)"
36+
export PACKAGECLOUD_TOKEN
3637

3738
echo "--- Pushing to Packagecloud"
3839
dry_run package_cloud push "${REPOSITORY}/${DISTRO_VERSION}" deb/*.deb

‎.buildkite/steps/publish-docker-image.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ parse_version() {
2828
IFS='.' read -r -a parts <<< "${v%-*}"
2929

3030
for idx in $(seq 1 ${#parts[*]}) ; do
31-
sed -e 's/ /./g' <<< "${parts[@]:0:$idx}"
31+
sed -e 's/ /./g' <<< "${parts[@]:0:$idx// /.}"
3232
done
3333

3434
[[ "${v%-*}" == "$v" ]] || echo "$v"

‎.buildkite/steps/publish-rpm-package.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ for ARCH in "x86_64" "i386" "aarch64"; do
8282
"${ARCH_PATH}/repodata"
8383

8484
# Copy the new RPMs in.
85-
find "rpm/" -type f -name "*${ARCH}*" | xargs cp -t "${ARCH_PATH}"
85+
find "rpm/" -type f -name "*${ARCH}*" -print0 | xargs cp -t "${ARCH_PATH}"
8686

8787
echo "--- Updating yum repository for ${CODENAME}/${ARCH}"
8888
if updaterepo "${ARCH_PATH}"; then
@@ -99,7 +99,7 @@ for ARCH in "x86_64" "i386" "aarch64"; do
9999
"${ARCH_PATH}"
100100

101101
# Copy the new RPMs in again.
102-
find "rpm/" -type f -name "*${ARCH}*" | xargs cp -t "${ARCH_PATH}"
102+
find "rpm/" -type f -name "*${ARCH}*" -print0 | xargs cp -t "${ARCH_PATH}"
103103

104104
echo "--- Recreating yum repository for ${CODENAME}/${ARCH}"
105105
createrepo "${ARCH_PATH}"

‎.buildkite/steps/publish-rpm-packagecloud.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ echo "--- Installing dependencies"
3232
gem install package_cloud
3333

3434
echo "--- Requesting OIDC token"
35-
export PACKAGECLOUD_TOKEN="$(buildkite-agent oidc request-token --audience "https://packagecloud.io/${REPOSITORY}" --lifetime 300)"
35+
PACKAGECLOUD_TOKEN="$(buildkite-agent oidc request-token --audience "https://packagecloud.io/${REPOSITORY}" --lifetime 300)"
36+
export PACKAGECLOUD_TOKEN
3637

3738
echo "--- Pushing to Packagecloud"
3839
dry_run package_cloud push "${REPOSITORY}/${DISTRO_VERSION}" rpm/*.rpm

‎.buildkite/steps/release-homebrew.sh‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,18 @@ function to_json {
1919

2020
echo '--- Getting agent version from build meta data'
2121

22-
export FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
23-
export AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
24-
export BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
25-
export IS_PRERELEASE=$(buildkite-agent meta-data get "agent-is-prerelease")
22+
FULL_AGENT_VERSION=$(buildkite-agent meta-data get "agent-version-full")
23+
export FULL_AGENT_VERSION
24+
25+
AGENT_VERSION=$(buildkite-agent meta-data get "agent-version")
26+
export AGENT_VERSION
27+
28+
BUILD_VERSION=$(buildkite-agent meta-data get "agent-version-build")
29+
export BUILD_VERSION
30+
31+
IS_PRERELEASE=$(buildkite-agent meta-data get "agent-is-prerelease")
32+
export IS_PRERELEASE
33+
2634

2735
echo "Full agent version: $FULL_AGENT_VERSION"
2836
echo "Agent version: $AGENT_VERSION"

‎install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ function buildkite-download {
102102
echo -e "\033[31mFailed to download file: $1\033[0m\n"
103103

104104
cat $BUILDKITE_DOWNLOAD_TMP_FILE
105-
exit $BUILDKITE_DOWNLOAD_EXIT_STATUS
105+
exit "$BUILDKITE_DOWNLOAD_EXIT_STATUS"
106106
fi
107107
}
108108

109109
echo -e "Installing Version: \033[35mv$VERSION\033[0m"
110110

111111
# Default the destination folder
112-
: ${DESTINATION:="$HOME/.buildkite-agent"}
112+
: "${DESTINATION:="$HOME/.buildkite-agent"}"
113113

114114
# If they have a $HOME/.buildkite folder, rename it to `buildkite-agent` and
115115
# symlink back to the old one. Since we changed the name of the folder, we

0 commit comments

Comments
 (0)