commit: eab4e8b40431c0162a6dadd7cd3c020072b83280
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 04:29:40 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 04:29:40 2019 +0000
URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=eab4e8b4
Add shellcheck tooling
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
init.d/net.lo.in | 1 +
mk/scripts.mk | 5 +++++
mk/subdir.mk | 2 ++
net/adsl.sh | 1 +
net/apipa.sh | 1 +
net/arping.sh | 1 +
net/bonding.sh | 1 +
net/br2684ctl.sh | 1 +
net/bridge.sh | 1 +
net/ccwgroup.sh | 1 +
net/clip.sh | 1 +
net/dhclient.sh | 1 +
net/dhcpcd.sh | 1 +
net/dummy.sh | 1 +
net/ethtool.sh | 1 +
net/firewalld.sh | 1 +
net/hsr.sh | 1 +
net/ifconfig.sh.BSD.in | 1 +
net/ifconfig.sh.Linux.in | 1 +
net/ifplugd.sh | 1 +
net/ifwatchd.sh.BSD.in | 1 +
net/ip6rd.sh | 1 +
net/ip6to4.sh | 1 +
net/ipppd.sh | 1 +
net/iproute2.sh | 1 +
net/iw.sh | 1 +
net/iwconfig.sh.BSD.in | 1 +
net/iwconfig.sh.Linux.in | 1 +
net/l2tp.sh | 1 +
net/macchanger.sh | 1 +
net/macnet.sh | 1 +
net/macvlan.sh | 1 +
net/netplugd.sh | 1 +
net/pppd.sh | 1 +
net/pump.sh | 1 +
net/ssidnet.sh | 1 +
net/system.sh | 1 +
net/tuntap.sh | 1 +
net/udhcpc.sh.Linux.in | 1 +
net/veth.sh | 1 +
net/vlan.sh | 1 +
net/wireguard.sh | 1 +
net/wpa_supplicant.sh | 1 +
sh/functions.sh | 1 +
sh/ifwatchd-carrier.sh.in | 1 +
sh/ifwatchd-nocarrier.sh.in | 1 +
sh/systemd-wrapper.sh.in | 1 +
sh/udhcpc-hook.sh.in | 1 +
48 files changed, 53 insertions(+)
diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 472ed0c..3afe046 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -1,4 +1,5 @@
#!@SBINDIR@/openrc-run
+# shellcheck shell=sh disable=SC1008
# Copyright (c) 2007-2009 Roy Marples <r...@marples.name>
# Copyright (c) 2010-2016 Gentoo Foundation
# Released under the 2-clause BSD license.
diff --git a/mk/scripts.mk b/mk/scripts.mk
index 736132a..7e512f0 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -14,6 +14,8 @@ _LCL_SED:= $(shell ${_LCL_SED_SH})
SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e
's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@CONFDIR@:${CONFDIR}:g' -e
's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e
's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' -e
's:@INITDIR@:${INITDIR}:g' ${_PKG_SED} ${_LCL_SED}
+SHELLCHECK_CMD = shellcheck -s sh --exclude SC1008 -f gcc
+
# Tweak our shell scripts
%.sh: %.sh.in
${SED} ${SED_REPLACE} ${SED_EXTRA} $< > $@
@@ -55,4 +57,7 @@ CLEANFILES+= ${OBJS}
clean:
@if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f
${CLEANFILES}; fi
+shellcheck: ${SRCS}
+ @$(SHELLCHECK_CMD) $<
+
include ${MK}/gitignore.mk
diff --git a/mk/subdir.mk b/mk/subdir.mk
index 7f198f8..4224b5f 100644
--- a/mk/subdir.mk
+++ b/mk/subdir.mk
@@ -29,3 +29,5 @@ depend:
${_SUBDIR}
ignore:
${_SUBDIR}
+shellcheck:
+ ${_SUBDIR}
diff --git a/net/adsl.sh b/net/adsl.sh
index 4bfe51f..7724710 100644
--- a/net/adsl.sh
+++ b/net/adsl.sh
@@ -1,6 +1,7 @@
# Copyright (c) 2004-2007 Gentoo Foundation
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
adsl_depend()
{
diff --git a/net/apipa.sh b/net/apipa.sh
index 6f3f910..849728b 100644
--- a/net/apipa.sh
+++ b/net/apipa.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
apipa_depend()
{
diff --git a/net/arping.sh b/net/arping.sh
index b03b8a9..7e178b7 100644
--- a/net/arping.sh
+++ b/net/arping.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
arping_depend()
{
diff --git a/net/bonding.sh b/net/bonding.sh
index 6e5d810..880f69b 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -1,6 +1,7 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# 2017 Marc Schiffbauer <msch...@gentoo.org>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
bonding_depend()
{
diff --git a/net/br2684ctl.sh b/net/br2684ctl.sh
index 8e48016..c3c9d41 100644
--- a/net/br2684ctl.sh
+++ b/net/br2684ctl.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
br2684ctl_depend()
{
diff --git a/net/bridge.sh b/net/bridge.sh
index 3dfd8b1..4166215 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
bridge_depend()
{
diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh
index aaf7de6..9d9bd43 100644
--- a/net/ccwgroup.sh
+++ b/net/ccwgroup.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars ccwgroup"
diff --git a/net/clip.sh b/net/clip.sh
index 3416075..96bfe6e 100644
--- a/net/clip.sh
+++ b/net/clip.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2005-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# shellcheck shell=sh disable=SC1008
clip_depend()
{
diff --git a/net/dhclient.sh b/net/dhclient.sh
index 1c4238e..fd27308 100644
--- a/net/dhclient.sh
+++ b/net/dhclient.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
dhclient_depend()
{
diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
index 479170f..1812b45 100644
--- a/net/dhcpcd.sh
+++ b/net/dhcpcd.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
dhcpcd_depend()
{
diff --git a/net/dummy.sh b/net/dummy.sh
index 3050216..421d951 100644
--- a/net/dummy.sh
+++ b/net/dummy.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2015 Gentoo Foundation
# All rights reserved. Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
dummy_depend()
{
diff --git a/net/ethtool.sh b/net/ethtool.sh
index 6023d74..57c98f7 100644
--- a/net/ethtool.sh
+++ b/net/ethtool.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2011 by Gentoo Foundation
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
ethtool_depend()
{
diff --git a/net/firewalld.sh b/net/firewalld.sh
index b20f571..32c4695 100644
--- a/net/firewalld.sh
+++ b/net/firewalld.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2012 Doug Goldstein <car...@cardoe.com>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
firewalld_depend()
{
diff --git a/net/hsr.sh b/net/hsr.sh
index 94ecc01..f5a427f 100644
--- a/net/hsr.sh
+++ b/net/hsr.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2015 Gentoo Foundation
# All rights reserved. Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
hsr_depend()
{
diff --git a/net/ifconfig.sh.BSD.in b/net/ifconfig.sh.BSD.in
index c7e98a2..ff0d17e 100644
--- a/net/ifconfig.sh.BSD.in
+++ b/net/ifconfig.sh.BSD.in
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
ifconfig_depend()
{
diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 3d91afa..09708a9 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
ifconfig_depend()
{
diff --git a/net/ifplugd.sh b/net/ifplugd.sh
index dcc0657..01e84e4 100644
--- a/net/ifplugd.sh
+++ b/net/ifplugd.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars plug_timeout"
diff --git a/net/ifwatchd.sh.BSD.in b/net/ifwatchd.sh.BSD.in
index 289b120..c706baa 100644
--- a/net/ifwatchd.sh.BSD.in
+++ b/net/ifwatchd.sh.BSD.in
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars plug_timeout"
diff --git a/net/ip6rd.sh b/net/ip6rd.sh
index a35e2b7..573d74b 100644
--- a/net/ip6rd.sh
+++ b/net/ip6rd.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2011 by Gentoo Foundation
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars link prefix suffix ipv4mask relay"
diff --git a/net/ip6to4.sh b/net/ip6to4.sh
index 51b3858..21acd71 100644
--- a/net/ip6to4.sh
+++ b/net/ip6to4.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars link suffix relay"
diff --git a/net/ipppd.sh b/net/ipppd.sh
index edf0aa0..57c20a4 100644
--- a/net/ipppd.sh
+++ b/net/ipppd.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
ipppd_depend()
{
diff --git a/net/iproute2.sh b/net/iproute2.sh
index 2d83534..5f65f1c 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
iproute2_depend()
{
diff --git a/net/iw.sh b/net/iw.sh
index de5797b..5462244 100644
--- a/net/iw.sh
+++ b/net/iw.sh
@@ -1,6 +1,7 @@
# Copyright (c) 2016 Brian Evans <grkni...@gentoo.org>
# Based on iwconfig.sh Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars ssid mode associate_timeout sleep_scan"
_config_vars="$_config_vars preferred_aps blacklist_aps"
diff --git a/net/iwconfig.sh.BSD.in b/net/iwconfig.sh.BSD.in
index 3acaf66..97a1d13 100644
--- a/net/iwconfig.sh.BSD.in
+++ b/net/iwconfig.sh.BSD.in
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars ssid mode associate_timeout preferred_aps"
_config_vars="$_config_vars blacklist_aps"
diff --git a/net/iwconfig.sh.Linux.in b/net/iwconfig.sh.Linux.in
index 293bc1f..02f748d 100644
--- a/net/iwconfig.sh.Linux.in
+++ b/net/iwconfig.sh.Linux.in
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars ssid mode associate_timeout sleep_scan"
_config_vars="$_config_vars preferred_aps blacklist_aps"
diff --git a/net/l2tp.sh b/net/l2tp.sh
index dec1986..7c5b064 100644
--- a/net/l2tp.sh
+++ b/net/l2tp.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2016 Emeric Verschuur <eme...@mbedsys.org>
# All rights reserved. Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
l2tp_depend()
{
diff --git a/net/macchanger.sh b/net/macchanger.sh
index ae9ff9b..d87d96e 100644
--- a/net/macchanger.sh
+++ b/net/macchanger.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
macchanger_depend()
{
diff --git a/net/macnet.sh b/net/macnet.sh
index 1ec2ad7..b51527e 100644
--- a/net/macnet.sh
+++ b/net/macnet.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
macnet_depend()
{
diff --git a/net/macvlan.sh b/net/macvlan.sh
index 1b95f5c..8d55717 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -2,6 +2,7 @@
# based on vlan.sh & tuntap.sh
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
macvlan_depend()
{
diff --git a/net/netplugd.sh b/net/netplugd.sh
index d7d937d..283f312 100644
--- a/net/netplugd.sh
+++ b/net/netplugd.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars plug_timeout"
diff --git a/net/pppd.sh b/net/pppd.sh
index ee5e7c2..6ca1396 100644
--- a/net/pppd.sh
+++ b/net/pppd.sh
@@ -1,6 +1,7 @@
# Copyright (c) 2005-2007 Gentoo Foundation
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
pppd_depend()
{
diff --git a/net/pump.sh b/net/pump.sh
index ddd454c..270b37d 100644
--- a/net/pump.sh
+++ b/net/pump.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
pump_depend()
{
diff --git a/net/ssidnet.sh b/net/ssidnet.sh
index b0eed56..376d6f0 100644
--- a/net/ssidnet.sh
+++ b/net/ssidnet.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
ssidnet_depend()
{
diff --git a/net/system.sh b/net/system.sh
index 98017d5..1f81493 100644
--- a/net/system.sh
+++ b/net/system.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
_config_vars="$_config_vars dns_servers dns_domain dns_search"
_config_vars="$_config_vars dns_sortlist dns_options"
diff --git a/net/tuntap.sh b/net/tuntap.sh
index 331fd83..29a7e46 100644
--- a/net/tuntap.sh
+++ b/net/tuntap.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
tuntap_depend()
{
diff --git a/net/udhcpc.sh.Linux.in b/net/udhcpc.sh.Linux.in
index 030d89e..53fe5eb 100644
--- a/net/udhcpc.sh.Linux.in
+++ b/net/udhcpc.sh.Linux.in
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
udhcpc_depend()
{
diff --git a/net/veth.sh b/net/veth.sh
index 5ff6587..80f9a8e 100644
--- a/net/veth.sh
+++ b/net/veth.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2018
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
veth_depend()
{
diff --git a/net/vlan.sh b/net/vlan.sh
index 194a6b0..da9f9c0 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2008 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
vlan_depend()
{
diff --git a/net/wireguard.sh b/net/wireguard.sh
index 8af76ca..a9aac69 100644
--- a/net/wireguard.sh
+++ b/net/wireguard.sh
@@ -1,6 +1,7 @@
# Copyright (c) 2016 Joakim Sindholt (zhasha)
# Copyright (c) 2018 Jason A. Donenfeld,
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
wireguard_depend()
{
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh
index 594a157..607d4e1 100644
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -1,5 +1,6 @@
# Copyright (c) 2007-2009 Roy Marples <r...@marples.name>
# Released under the 2-clause BSD license.
+# shellcheck shell=sh disable=SC1008
wpa_supplicant_depend()
{
diff --git a/sh/functions.sh b/sh/functions.sh
index 832e58e..994cf6d 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -1,5 +1,6 @@
# Compatibility layer for netifrc to work with multiple init
# systems.
+# shellcheck shell=sh disable=SC1008
# First check whether e* commands are present in the environment
if [ x$RC_GOT_FUNCTIONS = xyes -o -n "$(command -v ebegin 2>/dev/null)" ]; then
diff --git a/sh/ifwatchd-carrier.sh.in b/sh/ifwatchd-carrier.sh.in
index 5b5d8b3..ecfada3 100644
--- a/sh/ifwatchd-carrier.sh.in
+++ b/sh/ifwatchd-carrier.sh.in
@@ -1,5 +1,6 @@
#!@SHELL@
# Wrapper for ifwatchd(8)
+# shellcheck shell=sh disable=SC1008
IN_BACKGROUND=yes ; export IN_BACKGROUND
$RC_SERVICE --quiet start
diff --git a/sh/ifwatchd-nocarrier.sh.in b/sh/ifwatchd-nocarrier.sh.in
index bbecfe8..357cdf7 100644
--- a/sh/ifwatchd-nocarrier.sh.in
+++ b/sh/ifwatchd-nocarrier.sh.in
@@ -1,5 +1,6 @@
#!@SHELL@
# Wrapper for ifwatchd(8)
+# shellcheck shell=sh disable=SC1008
IN_BACKGROUND=yes ; export IN_BACKGROUND
$RC_SERVICE --quiet stop
diff --git a/sh/systemd-wrapper.sh.in b/sh/systemd-wrapper.sh.in
index b26f976..7004a91 100644
--- a/sh/systemd-wrapper.sh.in
+++ b/sh/systemd-wrapper.sh.in
@@ -1,4 +1,5 @@
#!/bin/sh
+# shellcheck shell=sh disable=SC1008
CONFDIR="@CONFDIR@"
LIBEXECDIR="@LIBEXECDIR@/sh"
diff --git a/sh/udhcpc-hook.sh.in b/sh/udhcpc-hook.sh.in
index bd03859..13ea336 100644
--- a/sh/udhcpc-hook.sh.in
+++ b/sh/udhcpc-hook.sh.in
@@ -1,5 +1,6 @@
#!@SHELL@
# busybox udhcp setup script
+# shellcheck shell=sh disable=SC1008
PATH=/bin:/usr/bin:/sbin:/usr/sbin
