Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 06:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename PH_TEST to SKIP_INSTALL

Browse source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König 2022-07-06 22:51:39 +02:00
parent 3d4476c9fb
commit 0a8761ee68
No known key found for this signature in database
GPG key ID: 4CDA6F249DD2B485
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
advanced/Scripts/webpage.sh
View file

@ -24,8 +24,8 @@ readonly gravityDBfile="/etc/pihole/gravity.db"
# Source install script for ${setupVars}, ${PI_HOLE_BIN_DIR} and valid_ip() # Source install script for ${setupVars}, ${PI_HOLE_BIN_DIR} and valid_ip()
readonly PI_HOLE_FILES_DIR="/etc/.pihole" readonly PI_HOLE_FILES_DIR="/etc/.pihole"
# shellcheck disable=SC2034 # used in basic-install # shellcheck disable=SC2034 # used in basic-install to source the script without running it
PH_TEST="true" SKIP_INSTALL="true"
source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
utilsfile="/opt/pihole/utils.sh" utilsfile="/opt/pihole/utils.sh"

4
automated install/basic-install.sh
View file

@ -2860,6 +2860,8 @@ main() {
fi fi
} }
if [[ "${PH_TEST}" != true ]] ; then # allow to source this script without running it
# used in docker-pihole and webpage.sh
if [[ "${SKIP_INSTALL}" != true ]] ; then
main "$@" main "$@"
fi fi