diff options
author | DL6ER <dl6er@dl6er.de> | 2021-01-05 11:50:11 +0300 |
---|---|---|
committer | DL6ER <dl6er@dl6er.de> | 2021-01-05 11:58:22 +0300 |
commit | 3b6286e1398b0b95fcb20673c87cc846e88a2a09 (patch) | |
tree | fadfb832467125272523891a2468db0127d51c14 | |
parent | e1a128f83390ceb3f15ce9d6fbb05af695dccaed (diff) |
Spellcheck improvements (no warnings in pihole and advanced/Scripts/webpage.sh remains)tweak/ensure_newline
Signed-off-by: DL6ER <dl6er@dl6er.de>
-rwxr-xr-x | advanced/Scripts/webpage.sh | 11 | ||||
-rwxr-xr-x | pihole | 22 |
2 files changed, 24 insertions, 9 deletions
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 93128e26..46148dc2 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -22,16 +22,21 @@ readonly gravityDBfile="/etc/pihole/gravity.db" # Source install script for ${setupVars}, ${PI_HOLE_BIN_DIR} and valid_ip() readonly PI_HOLE_FILES_DIR="/etc/.pihole" +setupVars="" +DHCP_IPv6=false # shellcheck disable=SC2034 # used in basic-install PH_TEST="true" source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" # ensure_newline() -source "utils.sh" +readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" +# shellcheck source=./utils.sh +source "${utilsfile}" -coltable="/opt/pihole/COL_TABLE" +readonly coltable="${PI_HOLE_SCRIPT_DIR}/COL_TABLE" if [[ -f ${coltable} ]]; then - source ${coltable} + # shellcheck source=./COL_TABLE + source "${coltable}" fi helpFunc() { @@ -18,12 +18,16 @@ setupVars="/etc/pihole/setupVars.conf" PI_HOLE_BIN_DIR="/usr/local/bin" readonly colfile="${PI_HOLE_SCRIPT_DIR}/COL_TABLE" +# shellcheck source=./advanced/Scripts/COL_TABLE source "${colfile}" # ensure_newline() -source "utils.sh" +readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" +# shellcheck source=./advanced/Scripts/utils.sh +source "${utilsfile}" webpageFunc() { + # shellcheck source=./advanced/Scripts/webpage.sh source "${PI_HOLE_SCRIPT_DIR}/webpage.sh" main "$@" exit 0 @@ -40,9 +44,13 @@ debugFunc() { # Pull off the `debug` leaving passed call augmentation flags in $1 shift + # We do not want to be warned about implicit concatenation of array in [[ ]] + # as this is exactly what we want here + # shellcheck disable=SC2199 if [[ "$@" == *"-a"* ]]; then automated="true" fi + # shellcheck disable=SC2199 if [[ "$@" == *"-w"* ]]; then web="true" fi @@ -157,7 +165,7 @@ Time: echo -e " ${INFO} Blocking already disabled, nothing to do" exit 0 fi - if [[ $# > 1 ]]; then + if [[ $# -gt 1 ]]; then local error=false if [[ "${2}" == *"s" ]]; then tt=${2%"s"} @@ -165,7 +173,7 @@ Time: local str="Disabling blocking for ${tt} seconds" echo -e " ${INFO} ${str}..." local str="Blocking will be re-enabled in ${tt} seconds" - nohup "${PI_HOLE_SCRIPT_DIR}"/pihole-reenable.sh ${tt} </dev/null &>/dev/null & + nohup "${PI_HOLE_SCRIPT_DIR}/pihole-reenable.sh" "${tt}" </dev/null &>/dev/null & else local error=true fi @@ -175,8 +183,8 @@ Time: local str="Disabling blocking for ${tt} minutes" echo -e " ${INFO} ${str}..." local str="Blocking will be re-enabled in ${tt} minutes" - tt=$((${tt}*60)) - nohup "${PI_HOLE_SCRIPT_DIR}"/pihole-reenable.sh ${tt} </dev/null &>/dev/null & + tt=$((tt*60)) + nohup "${PI_HOLE_SCRIPT_DIR}/pihole-reenable.sh" "${tt}" </dev/null &>/dev/null & else local error=true fi @@ -325,7 +333,8 @@ statusFunc() { tailFunc() { # Warn user if Pi-hole's logging is disabled - local logging_enabled=$(grep -c "^log-queries" /etc/dnsmasq.d/01-pihole.conf) + local logging_enabled + logging_enabled=$(grep -c "^log-queries" /etc/dnsmasq.d/01-pihole.conf) if [[ "${logging_enabled}" == "0" ]]; then # No "log-queries" lines are found. # Commented out lines (such as "#log-queries") are ignored @@ -366,6 +375,7 @@ Branches: exit 0 fi + # shellcheck source=./advanced/Scripts/piholeCheckout.sh source "${PI_HOLE_SCRIPT_DIR}"/piholeCheckout.sh shift checkout "$@" |