tyler.durden/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-07-28 16:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "source with source not dot (#6137)"

Browse Source 
This reverts commit 8fd2ebd3d7bc00fe4c36dcdae0932d7bab4a3c3c, reversing
changes made to 557bc6f1794244f55b36258a51e3bd494860b439.
This commit is contained in:
Adam Warner 2025-04-04 19:12:57 +01:00
parent 8fd2ebd3d7
commit 4108c817dc
No known key found for this signature in database
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
advanced/Scripts/piholeDebug.sh
View File

@ -42,7 +42,7 @@ else
fi fi
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /etc/pihole/versions . /etc/pihole/versions
# Read the value of an FTL config key. The value is printed to stdout. # Read the value of an FTL config key. The value is printed to stdout.
get_ftl_conf_value() { get_ftl_conf_value() {

4
advanced/Scripts/query.sh
View File

@ -22,10 +22,10 @@ domain=""
# Source color table # Source color table
colfile="/opt/pihole/COL_TABLE" colfile="/opt/pihole/COL_TABLE"
source "${colfile}" . "${colfile}"
# Source api functions # Source api functions
source "${PI_HOLE_INSTALL_DIR}/api.sh" . "${PI_HOLE_INSTALL_DIR}/api.sh"
Help() { Help() {
echo "Usage: pihole -q [option] <domain> echo "Usage: pihole -q [option] <domain>

2
advanced/Scripts/updatecheck.sh
View File

@ -40,7 +40,7 @@ function get_remote_hash() {
# Source the utils file for addOrEditKeyValPair() # Source the utils file for addOrEditKeyValPair()
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /opt/pihole/utils.sh . /opt/pihole/utils.sh
# Remove the below three legacy files if they exist # Remove the below three legacy files if they exist
rm -f "/etc/pihole/GitHubVersions" rm -f "/etc/pihole/GitHubVersions"

4
advanced/Scripts/version.sh
View File

@ -17,12 +17,12 @@ cachedVersions="/etc/pihole/versions"
if [ -f ${cachedVersions} ]; then if [ -f ${cachedVersions} ]; then
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "$cachedVersions" . "$cachedVersions"
else else
echo "Could not find /etc/pihole/versions. Running update now." echo "Could not find /etc/pihole/versions. Running update now."
pihole updatechecker pihole updatechecker
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "$cachedVersions" . "$cachedVersions"
fi fi
main() { main() {

2
advanced/Templates/pihole-FTL-poststop.sh
View File

@ -4,7 +4,7 @@
PI_HOLE_SCRIPT_DIR='/opt/pihole' PI_HOLE_SCRIPT_DIR='/opt/pihole'
utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "${utilsfile}" . "${utilsfile}"
# Get file paths # Get file paths
FTL_PID_FILE="$(getFTLConfigValue files.pid)" FTL_PID_FILE="$(getFTLConfigValue files.pid)"

2
advanced/Templates/pihole-FTL-prestart.sh
View File

@ -4,7 +4,7 @@
PI_HOLE_SCRIPT_DIR='/opt/pihole' PI_HOLE_SCRIPT_DIR='/opt/pihole'
utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "${utilsfile}" . "${utilsfile}"
# Get file paths # Get file paths
FTL_PID_FILE="$(getFTLConfigValue files.pid)" FTL_PID_FILE="$(getFTLConfigValue files.pid)"

2
advanced/Templates/pihole-FTL.service
View File

@ -13,7 +13,7 @@
PI_HOLE_SCRIPT_DIR="/opt/pihole" PI_HOLE_SCRIPT_DIR="/opt/pihole"
utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "${utilsfile}" . "${utilsfile}"
is_running() { is_running() {

6
gravity.sh
View File

@ -17,13 +17,13 @@ PI_HOLE_SCRIPT_DIR="/opt/pihole"
# Source utils.sh for GetFTLConfigValue # Source utils.sh for GetFTLConfigValue
utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh" utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "${utilsfile}" . "${utilsfile}"
coltable="${PI_HOLE_SCRIPT_DIR}/COL_TABLE" coltable="${PI_HOLE_SCRIPT_DIR}/COL_TABLE"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "${coltable}" . "${coltable}"
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh" . "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh"
basename="pihole" basename="pihole"
PIHOLE_COMMAND="/usr/local/bin/${basename}" PIHOLE_COMMAND="/usr/local/bin/${basename}"