From cb52ad3ba307fc2eb4a303052e3ce72af32eff8b Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 1 Dec 2016 13:31:35 -0800 Subject: [PATCH] Revert other branch chages. Signed-off-by: Dan Schaper --- automated install/basic-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index d481c135..d79f05b2 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -113,12 +113,12 @@ elif [ $(command -v rpm) ]; then PKG_UPDATE="${PKG_MANAGER} update -y" PKG_INSTALL="${PKG_MANAGER} install -y" PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l" - INSTALLER_DEPS=(iproute net-tools procps-ng newt git) - PIHOLE_DEPS=(bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php curl unzip wget findutils cronie sudo nmap-ncat) + INSTALLER_DEPS=( iproute net-tools procps-ng newt git ) + PIHOLE_DEPS=( epel-release bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php curl unzip wget findutils cronie sudo nmap-ncat ) - if ! grep -q 'Fedora' /etc/redhat-release; then - add_deps=(epel-release); - PIHOLE_DEPS=( "${add_deps[@]}" "${PIHOLE_DEPS[@]}" ); + if grep -q 'Fedora' /etc/redhat-release; then + remove_deps=(epel-release); + PIHOLE_DEPS=( ${PIHOLE_DEPS[@]/$remove_deps} ); fi LIGHTTPD_USER="lighttpd" LIGHTTPD_GROUP="lighttpd"