Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix shellcheck warnings and update Travis config #26

Merged
merged 3 commits into from
Jun 20, 2020
Merged

Fix shellcheck warnings and update Travis config #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e908ca7
Fix shellcheck warning and update Travis config
dpeukert Jun 20, 2020
516ec8c
Use a newer Ubuntu release
dpeukert Jun 20, 2020
2a80965
Add shellcheck ignore directive for which (default in shellcheck>=0.7.1)
dpeukert Jun 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
language: c
install:
- sudo apt-get update -qq
- sudo apt-get install -q vim-common file libffi6 libgmp10
- curl -L "http://archive.ubuntu.com/ubuntu/pool/universe/s/shellcheck/shellcheck_0.4.6-1_amd64.deb" -o "/tmp/shellcheck_0.4.6-1_amd64.deb"
- '[ "$(openssl dgst -sha256 "/tmp/shellcheck_0.4.6-1_amd64.deb" | cut -d " " -f 2)" == "95b4d2577f25ae47918bd53068a5ff42d5c34e5f884daa8dae32253044b45370" ]'
- sudo dpkg -i "/tmp/shellcheck_0.4.6-1_amd64.deb"
language: shell
dist: bionic
script: make && make test SHELL="bash -x"
3 changes: 2 additions & 1 deletion google-font-download
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ if [ "$(echo "test" | sed -E 's/([st]+)$/xx\1/' 2>/dev/null)" == "texxst" ]; the
elif [ "$(echo "test" | sed -r 's/([st]+)$/xx\1/' 2>/dev/null)" == "texxst" ]; then
ESED="sed -r"
else
# shellcheck disable=SC2230
err_exit "$(which sed) seems to lack extended regex support with -E or -r"
fi

Expand Down Expand Up @@ -431,7 +432,7 @@ for family in "${families[@]}"; do
# For each requested font format, download the font file and print the corresponding CSS statements.
for ((uaidx=0; uaidx < ${#formats[@]}; uaidx++)); do
uakey=${formats[$uaidx]}
if [ $uaidx -eq $(( ${#formats[@]} - 1 )) ]; then
if [ "$uaidx" -eq $(( ${#formats[@]} - 1 )) ]; then
terminator=";"
else
terminator=","
Expand Down