Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-03-02 23:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'InstallFixes2' into db

Browse source
This commit is contained in:
Adam Warner 2016-10-10 18:37:53 +01:00
commit c5adfd2c6e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
automated install/basic-install.sh
View file

@ -104,7 +104,7 @@ elif [ -x "$(command -v rpm)" ];then
LIGHTTPD_GROUP="lighttpd" LIGHTTPD_GROUP="lighttpd"
LIGHTTPD_CFG="lighttpd.conf.fedora" LIGHTTPD_CFG="lighttpd.conf.fedora"
package_check_install() { package_check_install() {
rpm -qa | grep ^"$1"- > /dev/null rpm -qa | grep ^"$1"- > /dev/null || ${PKG_INSTALL} "$1"
} }
else else
echo "OS distribution not supported" echo "OS distribution not supported"
@ -926,6 +926,9 @@ notify_package_updates_available
# Install packages used by this installation script # Install packages used by this installation script
install_dependent_packages INSTALLER_DEPS[@] install_dependent_packages INSTALLER_DEPS[@]
# Install packages used by the Pi-hole
install_dependent_packages PIHOLE_DEPS[@]
if [[ ${useUpdateVars} == false ]]; then if [[ ${useUpdateVars} == false ]]; then
# Display welcome dialogs # Display welcome dialogs
welcomeDialogs welcomeDialogs
@ -947,8 +950,6 @@ if [[ ${useUpdateVars} == false ]]; then
use4andor6 use4andor6
# Decide what upstream DNS Servers to use # Decide what upstream DNS Servers to use
setDNS setDNS
# Install packages used by the Pi-hole
install_dependent_packages PIHOLE_DEPS[@]
# Install and log everything to a file # Install and log everything to a file
installPihole | tee ${tmpLog} installPihole | tee ${tmpLog}
else else