Revert other branch chages.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This commit is contained in:
Dan Schaper 2016-12-01 13:31:35 -08:00
parent 2ec4acfe52
commit cb52ad3ba3
No known key found for this signature in database
GPG key ID: 572E999E385B7BFC

View file

@ -113,12 +113,12 @@ elif [ $(command -v rpm) ]; then
PKG_UPDATE="${PKG_MANAGER} update -y" PKG_UPDATE="${PKG_MANAGER} update -y"
PKG_INSTALL="${PKG_MANAGER} install -y" PKG_INSTALL="${PKG_MANAGER} install -y"
PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l" PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l"
INSTALLER_DEPS=(iproute net-tools procps-ng newt git) 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) 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 if grep -q 'Fedora' /etc/redhat-release; then
add_deps=(epel-release); remove_deps=(epel-release);
PIHOLE_DEPS=( "${add_deps[@]}" "${PIHOLE_DEPS[@]}" ); PIHOLE_DEPS=( ${PIHOLE_DEPS[@]/$remove_deps} );
fi fi
LIGHTTPD_USER="lighttpd" LIGHTTPD_USER="lighttpd"
LIGHTTPD_GROUP="lighttpd" LIGHTTPD_GROUP="lighttpd"