From 5fede23cf7f344d70c669969b8ddc603c82696a6 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Sat, 28 Jan 2017 18:39:15 +0000 Subject: [PATCH] trying another tactic --- automated install/basic-install.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index fd135fb7..3192c9a7 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1216,21 +1216,27 @@ main() { clone_or_update_repos # Install packages used by the Pi-hole - install_dependent_packages PIHOLE_DEPS[@] if [[ ${INSTALL_WEB} == true ]]; then - install_dependent_packages PIHOLE_WEB_DEPS[@] + DEPS=("${PIHOLE_DEPS}" "${PIHOLE_WEB_DEPS}") + else + DEPS=("${PIHOLE_DEPS}") fi + install_dependent_packages DEPS[@] + # Install and log everything to a file installPihole | tee ${tmpLog} else # Clone/Update the repos clone_or_update_repos - # update packages used by the Pi-hole - install_dependent_packages PIHOLE_DEPS[@] + + # Install packages used by the Pi-hole if [[ ${INSTALL_WEB} == true ]]; then - install_dependent_packages PIHOLE_WEB_DEPS[@] + DEPS=("${PIHOLE_DEPS}" "${PIHOLE_WEB_DEPS}") + else + DEPS=("${PIHOLE_DEPS}") fi + install_dependent_packages DEPS[@] updatePihole | tee ${tmpLog} fi