From 74524e024d477903fc7c3d2362aba898392b0932 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 10 Oct 2016 10:36:19 -0700 Subject: [PATCH] Always check PIHOLE_dependencies. --- automated install/basic-install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 99a5cc99..6875cf2f 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -102,7 +102,7 @@ elif [ -x "$(command -v rpm)" ];then LIGHTTPD_GROUP="lighttpd" LIGHTTPD_CFG="lighttpd.conf.fedora" package_check_install() { - rpm -qa | grep ^"$1"- > /dev/null + rpm -qa | grep ^"$1"- > /dev/null || ${PKG_INSTALL} "$1" } else echo "OS distribution not supported" @@ -922,6 +922,9 @@ notify_package_updates_available # Install packages used by this installation script install_dependent_packages INSTALLER_DEPS[@] +# Install packages used by the Pi-hole +install_dependent_packages PIHOLE_DEPS[@] + if [[ ${useUpdateVars} == false ]]; then # Display welcome dialogs welcomeDialogs @@ -943,8 +946,6 @@ if [[ ${useUpdateVars} == false ]]; then use4andor6 # Decide what upstream DNS Servers to use setDNS - # Install packages used by the Pi-hole - install_dependent_packages PIHOLE_DEPS[@] # Install and log everything to a file installPihole | tee ${tmpLog} else