arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 07:18:07 +00:00
Code Issues Releases Wiki Activity

Check for installation status within the parent function.

Browse Source 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This commit is contained in:
Dan Schaper 2016-12-21 22:57:42 -08:00
parent d5ed6c1901
commit 852341c601
No known key found for this signature in database
GPG Key ID: 572E999E385B7BFC
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
automated install/basic-install.sh
View File

@ -97,10 +97,6 @@ if [[ $(command -v apt-get) ]]; then
LIGHTTPD_CFG="lighttpd.conf.debian" LIGHTTPD_CFG="lighttpd.conf.debian"
DNSMASQ_USER="dnsmasq" DNSMASQ_USER="dnsmasq"
package_check() {
dpkg-query -W -f='${Status}' "${1}" 2>/dev/null | grep "ok installed"
return
}
elif [ $(command -v rpm) ]; then elif [ $(command -v rpm) ]; then
# Fedora Family # Fedora Family
if [ $(command -v dnf) ]; then if [ $(command -v dnf) ]; then
@ -116,8 +112,7 @@ elif [ $(command -v rpm) ]; then
PIHOLE_DEPS=(bc bind-utils cronie curl dnsmasq epel-release findutils lighttpd lighttpd-fastcgi nmap-ncat php php-common php-cli sudo unzip wget) PIHOLE_DEPS=(bc bind-utils cronie curl dnsmasq epel-release findutils lighttpd lighttpd-fastcgi nmap-ncat php php-common php-cli sudo unzip wget)
if grep -q 'Fedora' /etc/redhat-release; then if grep -q 'Fedora' /etc/redhat-release; then
remove_deps=(epel-release); PIHOLE_DEPS=(${PIHOLE_DEPS#epel-release});
PIHOLE_DEPS=( ${PIHOLE_DEPS[@]/$remove_deps} );
fi fi
LIGHTTPD_USER="lighttpd" LIGHTTPD_USER="lighttpd"
LIGHTTPD_GROUP="lighttpd" LIGHTTPD_GROUP="lighttpd"
@ -756,7 +751,7 @@ install_dependent_packages() {
if command -v debconf-apt-progress &> /dev/null; then if command -v debconf-apt-progress &> /dev/null; then
for i in "${argArray1[@]}"; do for i in "${argArray1[@]}"; do
echo -n "::: Checking for $i..." echo -n "::: Checking for $i..."
if package_check "${i}" &> /dev/null; then if dpkg-query -W -f='${Status}' "${i}" 2>/dev/null | grep "ok installed" &> /dev/null; then
echo " installed!" echo " installed!"
else else
echo " added to install list!" echo " added to install list!"