Merge pull request #4788 from pi-hole/SKIP_INSTALL

Rename PH_TEST to SKIP_INSTALL
This commit is contained in:
yubiuser 2022-07-09 00:01:48 +02:00 committed by GitHub
commit 8e4adb6e39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 16 additions and 15 deletions

View file

@ -2864,6 +2864,7 @@ main() {
fi
}
if [[ "${PH_TEST}" != true ]] ; then
# allow to source this script without running it
if [[ "${SKIP_INSTALL}" != true ]] ; then
main "$@"
fi

View file

@ -36,7 +36,7 @@ else
fi
readonly PI_HOLE_FILES_DIR="/etc/.pihole"
PH_TEST="true"
SKIP_INSTALL="true"
source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
# setupVars set in basic-install.sh
source "${setupVars}"