diff options
| author | MichaIng <micha@dietpi.com> | 2022-07-28 21:10:18 +0300 |
|---|---|---|
| committer | MichaIng <micha@dietpi.com> | 2022-08-17 21:48:11 +0300 |
| commit | b3c8045b529642d9bf8a909bdb15f7ac3d0e0228 (patch) | |
| tree | 7112ddb1923b1a614f811c4d89e197f983290274 | |
| parent | a0419bc1f08b5b4a30a5ae5745b625c2ca556e8a (diff) | |
Skip web server dialog if --disable-install-webserver has been passed
Prior to https://github.com/pi-hole/pi-hole/pull/4772, the web server dialog was skipped if --disable-install-webserver was passed (INSTALL_WEB_SERVER=false). This commit restores this behaviour.
Signed-off-by: MichaIng <micha@dietpi.com>
| -rwxr-xr-x | automated install/basic-install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index f141df41..0c7196ee 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1127,8 +1127,8 @@ setAdminFlag() { ;; esac - # If the user wants to install the Web admin interface (i.e. it has not been deselected above) - if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then + # If the user wants to install the Web admin interface (i.e. it has not been deselected above) and did not deselect the web server via command-line argument + if [[ "${INSTALL_WEB_INTERFACE}" == true && "${INSTALL_WEB_SERVER}" == true ]]; then # Get list of required PHP modules, excluding base package (common) and handler (cgi) local i php_modules for i in "${PIHOLE_WEB_DEPS[@]}"; do [[ $i == 'php'* && $i != *'-common' && $i != *'-cgi' ]] && php_modules+=" ${i#*-}"; done |