From 04c60e8a1c2aa2f6c06e6277018cea2b7db07eaf Mon Sep 17 00:00:00 2001 From: Promofaux Date: Mon, 5 Sep 2016 15:52:09 +0100 Subject: [PATCH] Switch fedora and debian install check order --- automated install/basic-install.sh | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 32a80307..0caa8bf7 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -57,7 +57,24 @@ else fi # Compatibility -if [ -x "$(command -v rpm)" ];then + +if [ -x "$(command -v apt-get)" ];then + # Debian Family + PKG_MANAGER="apt-get" + PKG_CACHE="/var/cache/apt" + UPDATE_PKG_CACHE="$PKG_MANAGER -qq update" + PKG_UPDATE="$PKG_MANAGER upgrade" + PKG_INSTALL="$PKG_MANAGER --yes --quiet install" + PKG_COUNT="$PKG_MANAGER -s -o Debug::NoLocking=true upgrade | grep -c ^Inst" + INSTALLER_DEPS=( apt-utils whiptail dhcpcd5) + PIHOLE_DEPS=( dnsutils bc dnsmasq lighttpd php5-common php5-cgi php5 git curl unzip wget sudo netcat ) + LIGHTTPD_USER="www-data" + LIGHTTPD_GROUP="www-data" + LIGHTTPD_CFG="lighttpd.conf.debian" + package_check() { + dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed" + } +elif [ -x "$(command -v rpm)" ];then # Fedora Family if [ -x "$(command -v dnf)" ];then PKG_MANAGER="dnf" @@ -77,22 +94,6 @@ if [ -x "$(command -v rpm)" ];then package_check() { rpm -qa | grep ^$1- > /dev/null } -elif [ -x "$(command -v apt-get)" ];then - # Debian Family - PKG_MANAGER="apt-get" - PKG_CACHE="/var/cache/apt" - UPDATE_PKG_CACHE="$PKG_MANAGER -qq update" - PKG_UPDATE="$PKG_MANAGER upgrade" - PKG_INSTALL="$PKG_MANAGER --yes --quiet install" - PKG_COUNT="$PKG_MANAGER -s -o Debug::NoLocking=true upgrade | grep -c ^Inst" - INSTALLER_DEPS=( apt-utils whiptail dhcpcd5) - PIHOLE_DEPS=( dnsutils bc dnsmasq lighttpd php5-common php5-cgi php5 git curl unzip wget sudo netcat ) - LIGHTTPD_USER="www-data" - LIGHTTPD_GROUP="www-data" - LIGHTTPD_CFG="lighttpd.conf.debian" - package_check() { - dpkg-query -W -f='${Status}' "$1" 2>/dev/null | grep -c "ok installed" - } else echo "OS distribution not supported" exit