Skip to content

Commit 9fbaa05

Browse files
authored
Fix quoting in shell scripts per shellcheck-0.9 (#6245)
Fix instances of `SC2086: Double quote to prevent globbing and word splitting`. Ref: https://www.shellcheck.net/wiki/SC2086
1 parent 13f05fd commit 9fbaa05

6 files changed

+11
-11
lines changed

check/build-changed-protos

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ else
4747
echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
4848
exit 1
4949
fi
50-
base="$(git merge-base ${rev} HEAD)"
51-
if [ "$(git rev-parse ${rev})" == "${base}" ]; then
50+
base="$(git merge-base "${rev}" HEAD)"
51+
if [ "$(git rev-parse "${rev}")" == "${base}" ]; then
5252
echo -e "Comparing against revision '${rev}'." >&2
5353
else
5454
echo -e "Comparing against revision '${rev}' (merge base ${base})." >&2

check/format-incremental

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ if (( only_changed == 1 )); then
7272
exit 1
7373
fi
7474
fi
75-
base="$(git merge-base ${rev} HEAD)"
76-
if [ "$(git rev-parse ${rev})" == "${base}" ]; then
75+
base="$(git merge-base "${rev}" HEAD)"
76+
if [ "$(git rev-parse "${rev}")" == "${base}" ]; then
7777
echo -e "Comparing against revision '${rev}'." >&2
7878
else
7979
echo -e "Comparing against revision '${rev}' (merge base ${base})." >&2

check/pylint-changed-files

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ else
4646
echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
4747
exit 1
4848
fi
49-
base="$(git merge-base ${rev} HEAD)"
50-
if [ "$(git rev-parse ${rev})" == "${base}" ]; then
49+
base="$(git merge-base "${rev}" HEAD)"
50+
if [ "$(git rev-parse "${rev}")" == "${base}" ]; then
5151
echo -e "Comparing against revision '${rev}'." >&2
5252
else
5353
echo -e "Comparing against revision '${rev}' (merge base ${base})." >&2

check/pytest-and-incremental-coverage

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ else
6060
echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
6161
exit 1
6262
fi
63-
base="$(git merge-base ${rev} HEAD)"
64-
if [ "$(git rev-parse ${rev})" == "${base}" ]; then
63+
base="$(git merge-base "${rev}" HEAD)"
64+
if [ "$(git rev-parse "${rev}")" == "${base}" ]; then
6565
echo -e "Comparing against revision '${rev}'." >&2
6666
else
6767
echo -e "Comparing against revision '${rev}' (merge base ${base})." >&2

check/pytest-changed-files

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ echo "Comparing against revision '${rev}'." >&2
5656
# Get the _test version of changed python files.
5757
typeset -a changed
5858
IFS=$'\n' read -r -d '' -a changed < \
59-
<(git diff --name-only ${rev} -- \
59+
<(git diff --name-only "${rev}" -- \
6060
| grep "\.py$" \
6161
| sed -e "s/\.py$/_test.py/" \
6262
| sed -e "s/_test_test\.py$/_test.py/" \

check/pytest-changed-files-and-incremental-coverage

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ else
4949
echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
5050
exit 1
5151
fi
52-
base="$(git merge-base ${rev} HEAD)"
53-
if [ "$(git rev-parse ${rev})" == "${base}" ]; then
52+
base="$(git merge-base "${rev}" HEAD)"
53+
if [ "$(git rev-parse "${rev}")" == "${base}" ]; then
5454
echo -e "Comparing against revision '${rev}'." >&2
5555
else
5656
echo -e "Comparing against revision '${rev}' (merge base ${base})." >&2

0 commit comments

Comments
 (0)