From 82e6bf12786908ccda643dd1dceb42abcc97290c Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 3 Oct 2021 14:23:45 -0400
Subject: [PATCH] ci/test-metrics: Clean up various bash quoting issues
(cherry picked from commit 91cd124843d3c03639ec12a62b2b43d9b45a8d52)
---
.gitlab/test-metrics.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab/test-metrics.sh b/.gitlab/test-metrics.sh
index fe165736725a..8d67ee7ceedd 100755
--- a/.gitlab/test-metrics.sh
+++ b/.gitlab/test-metrics.sh
@@ -17,7 +17,7 @@ fail() {
function pull() {
local ref="refs/notes/$REF"
- run git fetch -f $NOTES_ORIGIN $ref:$ref
+ run git fetch -f "$NOTES_ORIGIN" "$ref:$ref"
echo "perf notes ref $ref is $(git rev-parse $ref)"
}
@@ -25,8 +25,8 @@ function pull() {
# This is favoured over a git notes merge as it avoids potential data loss/duplication from the merge strategy.
function reset_append_note_push {
pull || true
- run git notes --ref=$REF append -F $METRICS_FILE HEAD
- run git push $PERF_NOTES_PUSH_REPO refs/notes/$REF
+ run git notes --ref="$REF" append -F "$METRICS_FILE" HEAD
+ run git push "$PERF_NOTES_PUSH_REPO" "refs/notes/$REF"
}
function push() {
@@ -41,17 +41,17 @@ function push() {
fi
# TEST_ENV must be set.
- if [ -z ${TEST_ENV+"$TEST_ENV"} ]
+ if [ -z "${TEST_ENV:-}" ]
then
fail "Not pushing performance git notes: TEST_ENV must be set."
fi
# Assert that the METRICS_FILE exists and can be read.
- if [ -z ${METRICS_FILE+"$METRICS_FILE"} ]
+ if [ -z "${METRICS_FILE:-}" ]
then
fail "\$METRICS_FILE not set."
fi
- if ! [ -r $METRICS_FILE ]
+ if ! [ -r "$METRICS_FILE" ]
then
fail "Metrics file not found: $METRICS_FILE"
fi
--
GitLab