From 1652ebeb67ddfb4f94fd18f8ae2c0886b012fa0d Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 2 Apr 2020 13:44:13 +0200 Subject: [PATCH] fix shecllcheck source directives --- lib/bkctld-check | 2 +- lib/bkctld-firewall | 4 ++-- lib/bkctld-help | 2 +- lib/bkctld-inc | 2 +- lib/bkctld-init | 4 ++-- lib/bkctld-ip | 4 ++-- lib/bkctld-is-on | 4 ++-- lib/bkctld-key | 4 ++-- lib/bkctld-list | 2 +- lib/bkctld-port | 4 ++-- lib/bkctld-reload | 4 ++-- lib/bkctld-remove | 6 +++--- lib/bkctld-restart | 4 ++-- lib/bkctld-rm | 2 +- lib/bkctld-start | 4 ++-- lib/bkctld-stats | 2 +- lib/bkctld-status | 4 ++-- lib/bkctld-stop | 4 ++-- lib/bkctld-sync | 4 ++-- lib/bkctld-update | 4 ++-- 20 files changed, 35 insertions(+), 35 deletions(-) diff --git a/lib/bkctld-check b/lib/bkctld-check index db015b7..4f8319c 100755 --- a/lib/bkctld-check +++ b/lib/bkctld-check @@ -4,7 +4,7 @@ # Usage: check # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" return=0 diff --git a/lib/bkctld-firewall b/lib/bkctld-firewall index e9a99a2..93530aa 100755 --- a/lib/bkctld-firewall +++ b/lib/bkctld-firewall @@ -4,10 +4,10 @@ # Usage: firewall |all # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ ! -n "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 diff --git a/lib/bkctld-help b/lib/bkctld-help index b8743e2..9bfb0c6 100755 --- a/lib/bkctld-help +++ b/lib/bkctld-help @@ -4,7 +4,7 @@ # Usage: help # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" cat < # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi diff --git a/lib/bkctld-ip b/lib/bkctld-ip index cf11d68..e102755 100755 --- a/lib/bkctld-ip +++ b/lib/bkctld-ip @@ -4,10 +4,10 @@ # Usage: ip [|all] # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" ip="${2:-}" if [ ! -n "${jail_name}" ]; then diff --git a/lib/bkctld-is-on b/lib/bkctld-is-on index 9a22b9d..fb83c95 100755 --- a/lib/bkctld-is-on +++ b/lib/bkctld-is-on @@ -4,10 +4,10 @@ # Usage: is-on # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 diff --git a/lib/bkctld-key b/lib/bkctld-key index 4e93f8d..a738c76 100755 --- a/lib/bkctld-key +++ b/lib/bkctld-key @@ -4,10 +4,10 @@ # Usage: key [] # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" keyfile="${2:-}" if [ ! -n "${jail_name}" ]; then diff --git a/lib/bkctld-list b/lib/bkctld-list index f95a15b..25647d9 100755 --- a/lib/bkctld-list +++ b/lib/bkctld-list @@ -6,7 +6,7 @@ set -eu -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" [ -d "${JAILDIR}" ] || exit 0 diff --git a/lib/bkctld-port b/lib/bkctld-port index 887b18e..2de69b8 100755 --- a/lib/bkctld-port +++ b/lib/bkctld-port @@ -4,10 +4,10 @@ # Usage: port [|auto] # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" port="${2:-}" if [ ! -n "${jail_name}" ]; then diff --git a/lib/bkctld-reload b/lib/bkctld-reload index 22d1d5f..7dad023 100755 --- a/lib/bkctld-reload +++ b/lib/bkctld-reload @@ -4,10 +4,10 @@ # Usage: reload |all # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi diff --git a/lib/bkctld-remove b/lib/bkctld-remove index b868b51..ea0ac2f 100755 --- a/lib/bkctld-remove +++ b/lib/bkctld-remove @@ -4,10 +4,10 @@ # Usage: remove |all # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi @@ -23,7 +23,7 @@ jail_inode=$(stat --format=%i "${jail_path}") if [ "${jail_inode}" -eq 256 ]; then /bin/btrfs subvolume delete "${jail_path}" | debug else - rm -rf "${jail_path}" | debug + rm -rf "${jail_path:?}" | debug fi # TODO: use functions here if [ -d "${incs_path}" ]; then diff --git a/lib/bkctld-restart b/lib/bkctld-restart index 872c506..1b84e13 100755 --- a/lib/bkctld-restart +++ b/lib/bkctld-restart @@ -6,10 +6,10 @@ set -eu -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi diff --git a/lib/bkctld-rm b/lib/bkctld-rm index 203a59d..319a837 100755 --- a/lib/bkctld-rm +++ b/lib/bkctld-rm @@ -4,7 +4,7 @@ # Usage: rm # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" relative_date() { diff --git a/lib/bkctld-start b/lib/bkctld-start index d062b2f..03481f9 100755 --- a/lib/bkctld-start +++ b/lib/bkctld-start @@ -4,10 +4,10 @@ # Usage: start |all # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi diff --git a/lib/bkctld-stats b/lib/bkctld-stats index 2096a98..ddcbcfe 100755 --- a/lib/bkctld-stats +++ b/lib/bkctld-stats @@ -4,7 +4,7 @@ # Usage: stats # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" mkdir -p "${INDEX_DIR}" diff --git a/lib/bkctld-status b/lib/bkctld-status index 034a488..52d297a 100755 --- a/lib/bkctld-status +++ b/lib/bkctld-status @@ -4,10 +4,10 @@ # Usage: status [] # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail="${1:-}" +jail="${1:?}" if [ ! -n "${jail}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi diff --git a/lib/bkctld-stop b/lib/bkctld-stop index 18dc502..f2489f7 100755 --- a/lib/bkctld-stop +++ b/lib/bkctld-stop @@ -4,10 +4,10 @@ # Usage: stop |all # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi diff --git a/lib/bkctld-sync b/lib/bkctld-sync index 8550241..761f8fe 100755 --- a/lib/bkctld-sync +++ b/lib/bkctld-sync @@ -4,10 +4,10 @@ # Usage: sync |all # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ -z "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi diff --git a/lib/bkctld-update b/lib/bkctld-update index 21d30e8..2169ba2 100755 --- a/lib/bkctld-update +++ b/lib/bkctld-update @@ -4,10 +4,10 @@ # Usage: update |all # -# shellcheck source=./config +# shellcheck source=./includes LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes" -jail_name="${1:-}" +jail_name="${1:?}" if [ ! -n "${jail_name}" ]; then "${LIBDIR}/bkctld-help" && exit 1 fi