Use 'language: generic' for shellcheck, fix typo, correct indentation

This commit is contained in:
François Chavant 2017-12-04 18:15:02 +01:00
parent 59c9a2b243
commit 4467f51e42
3 changed files with 4 additions and 3 deletions

View File

@ -53,6 +53,7 @@ matrix:
python: null python: null
node_js: "lts/*" node_js: "lts/*"
- os: linux - os: linux
language: generic
env: TESTENV=shellcheck env: TESTENV=shellcheck
services: docker services: docker
fast_finish: true fast_finish: true

View File

@ -57,7 +57,7 @@ notice () {
# Update a database of a feed and open new URLs # Update a database of a feed and open new URLs
read_items () { read_items () {
cd read_urls || return cd read_urls || return 1
feed_file="$(echo "$1" | tr -d /)" feed_file="$(echo "$1" | tr -d /)"
feed_temp_file="$(mktemp "$feed_file.tmp.XXXXXXXXXX")" feed_temp_file="$(mktemp "$feed_file.tmp.XXXXXXXXXX")"
feed_new_items="$(mktemp "$feed_file.new.XXXXXXXXXX")" feed_new_items="$(mktemp "$feed_file.new.XXXXXXXXXX")"
@ -85,7 +85,7 @@ if [ ! -d "$config_dir/read_urls" ]; then
mkdir -p "$config_dir/read_urls" mkdir -p "$config_dir/read_urls"
fi fi
cd "$config_dir" || exit cd "$config_dir" || exit 1
if [ $# != 0 ]; then if [ $# != 0 ]; then
for arg in "$@"; do for arg in "$@"; do

View File

@ -22,7 +22,7 @@ elif [[ $TESTENV == shellcheck ]]; then
IFS=" " read -r -a scripts <<< "$dev_scripts $userscripts" IFS=" " read -r -a scripts <<< "$dev_scripts $userscripts"
docker run \ docker run \
-v "$PWD:/outside" \ -v "$PWD:/outside" \
-w /outside \ -w /outside \
koalaman/shellcheck:latest "${scripts[@]}" koalaman/shellcheck:latest "${scripts[@]}"
else else
args=() args=()