Shellcheck: move excludes to action env

This commit is contained in:
Stanislas Lange 2020-08-03 17:50:40 +02:00
parent e52a54b92f
commit 1e3006c9ec
No known key found for this signature in database
GPG Key ID: 710D9597C7EAD8CF
2 changed files with 11 additions and 20 deletions

View File

@ -1,10 +1,4 @@
on:
push:
branches:
- master
pull_request:
branches:
- master
on: push
name: Lint
@ -12,17 +6,17 @@ jobs:
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: shellcheck
uses: ludeeus/action-shellcheck@0.5.0
env:
SHELLCHECK_OPTS: -e SC1091,SC2164,SC2034,SC1072,SC1073,SC1009
- uses: actions/checkout@v2
- name: shellcheck
uses: ludeeus/action-shellcheck@0.5.0
env:
SHELLCHECK_OPTS: -e SC1091,SC2164,SC2034,SC1072,SC1073,SC1009
shfmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: shfmt
uses: bltavares/actions/shfmt@master
env:
SHFMT_ARGS: -d
- uses: actions/checkout@v2
- name: shfmt
uses: bltavares/actions/shfmt@master
env:
SHFMT_ARGS: -d

View File

@ -18,7 +18,6 @@ function tunAvailable() {
function checkOS() {
if [[ -e /etc/debian_version ]]; then
OS="debian"
# shellcheck disable=SC1091
source /etc/os-release
if [[ $ID == "debian" || $ID == "raspbian" ]]; then
@ -51,7 +50,6 @@ function checkOS() {
fi
fi
elif [[ -e /etc/system-release ]]; then
# shellcheck disable=SC1091
source /etc/os-release
if [[ $ID == "fedora" ]]; then
OS="fedora"
@ -1206,7 +1204,6 @@ function removeUnbound() {
function removeOpenVPN() {
echo ""
# shellcheck disable=SC2034
read -rp "Do you really want to remove OpenVPN? [y/n]: " -e -i n REMOVE
if [[ $REMOVE == 'y' ]]; then
# Get OpenVPN port from the configuration