Revert #6137 (#6146)

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() {

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] <domain>

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"

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() {

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)"

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)"

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() {

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}"