From 4108c817dc4b478264f44064b90183d9f784ce6a Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Fri, 4 Apr 2025 19:12:57 +0100 Subject: [PATCH] Revert "source with source not dot (#6137)" This reverts commit 8fd2ebd3d7bc00fe4c36dcdae0932d7bab4a3c3c, reversing changes made to 557bc6f1794244f55b36258a51e3bd494860b439. --- advanced/Scripts/piholeDebug.sh | 2 +- advanced/Scripts/query.sh | 4 ++-- advanced/Scripts/updatecheck.sh | 2 +- advanced/Scripts/version.sh | 4 ++-- advanced/Templates/pihole-FTL-poststop.sh | 2 +- advanced/Templates/pihole-FTL-prestart.sh | 2 +- advanced/Templates/pihole-FTL.service | 2 +- gravity.sh | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh index 372df27f..f4226299 100755 --- a/advanced/Scripts/piholeDebug.sh +++ b/advanced/Scripts/piholeDebug.sh @@ -42,7 +42,7 @@ else fi # shellcheck disable=SC1091 -source /etc/pihole/versions +. /etc/pihole/versions # Read the value of an FTL config key. The value is printed to stdout. get_ftl_conf_value() { diff --git a/advanced/Scripts/query.sh b/advanced/Scripts/query.sh index a65a1f07..3340bdd2 100755 --- a/advanced/Scripts/query.sh +++ b/advanced/Scripts/query.sh @@ -22,10 +22,10 @@ domain="" # Source color table colfile="/opt/pihole/COL_TABLE" -source "${colfile}" +. "${colfile}" # Source api functions -source "${PI_HOLE_INSTALL_DIR}/api.sh" +. "${PI_HOLE_INSTALL_DIR}/api.sh" Help() { echo "Usage: pihole -q [option] diff --git a/advanced/Scripts/updatecheck.sh b/advanced/Scripts/updatecheck.sh index 0124808b..b325ee9c 100755 --- a/advanced/Scripts/updatecheck.sh +++ b/advanced/Scripts/updatecheck.sh @@ -40,7 +40,7 @@ function get_remote_hash() { # Source the utils file for addOrEditKeyValPair() # shellcheck disable=SC1091 -source /opt/pihole/utils.sh +. /opt/pihole/utils.sh # Remove the below three legacy files if they exist rm -f "/etc/pihole/GitHubVersions" diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh index 9e6fe75a..540924c2 100755 --- a/advanced/Scripts/version.sh +++ b/advanced/Scripts/version.sh @@ -17,12 +17,12 @@ cachedVersions="/etc/pihole/versions" if [ -f ${cachedVersions} ]; then # shellcheck disable=SC1090 - source "$cachedVersions" + . "$cachedVersions" else echo "Could not find /etc/pihole/versions. Running update now." pihole updatechecker # shellcheck disable=SC1090 - source "$cachedVersions" + . "$cachedVersions" fi main() { diff --git a/advanced/Templates/pihole-FTL-poststop.sh b/advanced/Templates/pihole-FTL-poststop.sh index 38d3cc33..b5ddbc97 100755 --- a/advanced/Templates/pihole-FTL-poststop.sh +++ b/advanced/Templates/pihole-FTL-poststop.sh @@ -4,7 +4,7 @@ PI_HOLE_SCRIPT_DIR='/opt/pihole' utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" # shellcheck disable=SC1090 -source "${utilsfile}" +. "${utilsfile}" # Get file paths FTL_PID_FILE="$(getFTLConfigValue files.pid)" diff --git a/advanced/Templates/pihole-FTL-prestart.sh b/advanced/Templates/pihole-FTL-prestart.sh index 99c47a3f..37d750a2 100755 --- a/advanced/Templates/pihole-FTL-prestart.sh +++ b/advanced/Templates/pihole-FTL-prestart.sh @@ -4,7 +4,7 @@ PI_HOLE_SCRIPT_DIR='/opt/pihole' utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" # shellcheck disable=SC1090 -source "${utilsfile}" +. "${utilsfile}" # Get file paths FTL_PID_FILE="$(getFTLConfigValue files.pid)" diff --git a/advanced/Templates/pihole-FTL.service b/advanced/Templates/pihole-FTL.service index 67f509b5..151d4f90 100644 --- a/advanced/Templates/pihole-FTL.service +++ b/advanced/Templates/pihole-FTL.service @@ -13,7 +13,7 @@ PI_HOLE_SCRIPT_DIR="/opt/pihole" utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" # shellcheck disable=SC1090 -source "${utilsfile}" +. "${utilsfile}" is_running() { diff --git a/gravity.sh b/gravity.sh index 50180d02..824ba5e1 100755 --- a/gravity.sh +++ b/gravity.sh @@ -17,13 +17,13 @@ PI_HOLE_SCRIPT_DIR="/opt/pihole" # Source utils.sh for GetFTLConfigValue utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" # shellcheck disable=SC1090 -source "${utilsfile}" +. "${utilsfile}" coltable="${PI_HOLE_SCRIPT_DIR}/COL_TABLE" # shellcheck disable=SC1090 -source "${coltable}" +. "${coltable}" # shellcheck disable=SC1091 -source "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh" +. "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh" basename="pihole" PIHOLE_COMMAND="/usr/local/bin/${basename}"