Skip to content

Commit 530702c

Browse files
committed
scripts/lint: small refactors
* replace echo with printf * ensure unique exit code for each lint failure
1 parent a5a6125 commit 530702c

File tree

1 file changed

+29
-23
lines changed

1 file changed

+29
-23
lines changed

scripts/lint

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ cd "$vimgodir"
1010
### Setup Vim and other dependencies.
1111
#####################################
1212
if [ -z "${1:-}" ]; then
13-
echo "unknown version: '${1:-}'"
14-
echo "First argument must be 'vim-8.2', 'vim-9.1' or 'nvim'."
15-
exit 1
13+
printf "unknown version: '%s'\n" "${1:-}" >&2
14+
printf "First argument must be 'vim-8.2', 'vim-9.1' or 'nvim'.\n" >&2
15+
exit 1
1616
fi
1717

1818
vim=$1
@@ -21,32 +21,33 @@ export GOPATH=$vimdir
2121
export PATH="${GOPATH}/bin:$PATH"
2222

2323
if [ ! -f "$vimdir/bin/vim" ]; then
24-
echo "$vimdir/bin/vim doesn't exist; did you install it with the install-vim script?"
25-
exit 1
24+
printf "%s/bin/vim doesn't exist; did you install it with the install-vim script?\n" "$vimdir" >&2
25+
exit 1
2626
fi
2727

2828
### Run vint
2929
############
3030
failed=0
31-
printf "Running vint ... "
31+
printf "Running vint ... \n" >&2
3232
if [ -x "$(command -v vint)" ]; then
3333
lint=$(vint "$vimgodir" 2>&1 ||:)
3434
if [ -n "$lint" ]; then
35-
echo "FAILED"
36-
echo "$lint"
37-
echo
38-
failed=6
35+
printf "FAILED\n" >&2
36+
printf "$lint" >&2
37+
printf "\n" >&2
38+
# set failed to 3, because exit code 2 is used by python to indicate a problem running a command.
39+
failed=3
3940
else
40-
echo "PASSED"
41+
printf "PASSED\n" >&2
4142
fi
4243
else
43-
echo "SKIPPED"
44-
echo "'vint' binary not found; use 'pip install vim-vint' to install it."
44+
printf "SKIPPED\n" >&2
45+
printf "vint binary not found; use 'pip install vim-vint' to install it.\n" >&2
4546
fi
4647

4748
### Run vim-vimlint
4849
###################
49-
printf "Running vim-vimlint ... "
50+
printf "Running vim-vimlint ... \n" >&2
5051
lint=$(sh "$vimdir/share/vim/vimgo/pack/vim-go/start/vim-vimlint/bin/vimlint.sh" \
5152
-p "$vimdir/share/vim/vimgo/pack/vim-go/start/vim-vimlparser" \
5253
-l "$vimdir/share/vim/vimgo/pack/vim-go/start/vim-vimlint" \
@@ -57,16 +58,21 @@ lint=$(sh "$vimdir/share/vim/vimgo/pack/vim-go/start/vim-vimlint/bin/vimlint.sh"
5758
2>&1)
5859
result="$?"
5960
if [ "$result" -eq "2" ]; then
60-
echo "$lint"
61-
echo
62-
failed=6
61+
printf "FAILED\n" >&2
62+
printf "$lint" >&2
63+
printf "\n" >&2
64+
failed=4
65+
elif [ "$result" -ne "0" ]; then
66+
printf "FAILED\n" >&2
67+
printf "$lint" >&2
68+
printf "\n" >&2
6369
else
64-
echo "PASSED"
70+
printf "PASSED\n" >&2
6571
fi
6672

6773
### Run vimhelplint.
6874
####################
69-
printf "Running vimhelplint ... "
75+
printf "Running vimhelplint ... \n" >&2
7076

7177
# set modeline explicitly so that the modeline will be respected when run as root.
7278
lint=$($vimdir/bin/vim -esNR \
@@ -78,11 +84,11 @@ lint=$($vimdir/bin/vim -esNR \
7884
+q \
7985
2>&1 ||:)
8086
if [ "$lint" ]; then
81-
echo "FAILED"
82-
echo "$lint"
83-
failed=6
87+
printf "FAILED\n" >&2
88+
printf "$lint" >&2
89+
failed=5
8490
else
85-
echo "PASSED"
91+
printf "PASSED\n" >&2
8692
fi
8793

8894
exit "$failed"

0 commit comments

Comments
 (0)