diff options
| author | yubiuser <ckoenig@posteo.de> | 2022-07-09 01:01:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-09 01:01:48 +0300 |
| commit | 8e4adb6e39409dfd14667543e28ebfa33be6af79 (patch) | |
| tree | 251a13a48ddf70f26bf081f5e61a49934b09ddbd /advanced | |
| parent | 6aaa4463547a00256368b8b610e4243bc2898a66 (diff) | |
| parent | 518cbd10e0858c642be97b67af67b1598991e38d (diff) | |
Merge pull request #4788 from pi-hole/SKIP_INSTALL
Rename PH_TEST to SKIP_INSTALL
Diffstat (limited to 'advanced')
| -rwxr-xr-x | advanced/Scripts/piholeCheckout.sh | 2 | ||||
| -rwxr-xr-x | advanced/Scripts/update.sh | 2 | ||||
| -rwxr-xr-x | advanced/Scripts/webpage.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/advanced/Scripts/piholeCheckout.sh b/advanced/Scripts/piholeCheckout.sh index 4c0a4f40..7c4a1f77 100755 --- a/advanced/Scripts/piholeCheckout.sh +++ b/advanced/Scripts/piholeCheckout.sh @@ -9,7 +9,7 @@ # Please see LICENSE file for your rights under this license. readonly PI_HOLE_FILES_DIR="/etc/.pihole" -PH_TEST="true" +SKIP_INSTALL="true" source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" # webInterfaceGitUrl set in basic-install.sh diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh index 9da85c89..609a054b 100755 --- a/advanced/Scripts/update.sh +++ b/advanced/Scripts/update.sh @@ -17,7 +17,7 @@ readonly PI_HOLE_GIT_URL="https://github.com/pi-hole/pi-hole.git" readonly PI_HOLE_FILES_DIR="/etc/.pihole" # shellcheck disable=SC2034 -PH_TEST=true +SKIP_INSTALL=true # when --check-only is passed to this script, it will not perform the actual update CHECK_ONLY=false diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 279de9e9..29c53bd6 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -24,8 +24,8 @@ readonly gravityDBfile="/etc/pihole/gravity.db" # Source install script for ${setupVars}, ${PI_HOLE_BIN_DIR} and valid_ip() readonly PI_HOLE_FILES_DIR="/etc/.pihole" -# shellcheck disable=SC2034 # used in basic-install -PH_TEST="true" +# shellcheck disable=SC2034 # used in basic-install to source the script without running it +SKIP_INSTALL="true" source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" utilsfile="/opt/pihole/utils.sh" |