Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-20 14:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Jettison vestigial function, print debugging information on failed install

Browse source
This commit is contained in:
Eric Warnke 2016-10-27 20:27:26 -04:00
parent 8e0723c648
commit 11c0b1f660
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
automated install/basic-install.sh
View file

@ -92,9 +92,6 @@ if [ -x "$(command -v apt-get)" ]; then
LIGHTTPD_GROUP="www-data" LIGHTTPD_GROUP="www-data"
LIGHTTPD_CFG="lighttpd.conf.debian" LIGHTTPD_CFG="lighttpd.conf.debian"
DNSMASQ_USER="dnsmasq" DNSMASQ_USER="dnsmasq"
package_check_install() {
${PKG_INSTALL} "${1}"
}
elif [ -x "$(command -v rpm)" ]; then elif [ -x "$(command -v rpm)" ]; then
# Fedora Family # Fedora Family
if [ -x "$(command -v dnf)" ]; then if [ -x "$(command -v dnf)" ]; then
@ -117,9 +114,6 @@ elif [ -x "$(command -v rpm)" ]; then
LIGHTTPD_GROUP="lighttpd" LIGHTTPD_GROUP="lighttpd"
LIGHTTPD_CFG="lighttpd.conf.fedora" LIGHTTPD_CFG="lighttpd.conf.fedora"
DNSMASQ_USER="nobody" DNSMASQ_USER="nobody"
package_check_install() {
${PKG_INSTALL} "${1}"
}
else else
echo "OS distribution not supported" echo "OS distribution not supported"
exit exit
@ -665,11 +659,12 @@ notify_package_updates_available() {
install_dependent_packages() { install_dependent_packages() {
# Install packages passed in via argument array # Install packages passed in via argument array
# No spinner - conflicts with set -e # No spinner - conflicts with set -e
local PKG_MGR_OUT
declare -a argArray1=("${!1}") declare -a argArray1=("${!1}")
for i in "${argArray1[@]}"; do for i in "${argArray1[@]}"; do
echo -n "::: Installing $i..." echo -n "::: Installing $i..."
PKG_MGR_OUT=$(package_check_install "${i}" 2>&1 ) && echo "Installed!" || ( PKG_MGR_OUT=$(${PKG_INSTALL} "${i}" 2>&1 ) && echo "Installed!" || (
echo "PACKAGE INSTALL ERROR" && echo "$PKG_MGR_OUT" && \ echo "PACKAGE INSTALL ERROR" && echo "$PKG_MGR_OUT" && \
echo "::: Sometimes this can be a transitory error, check connectivity and retry" && exit 1 ) echo "::: Sometimes this can be a transitory error, check connectivity and retry" && exit 1 )
done done
@ -850,7 +845,7 @@ configureSelinux() {
if [ -x "$(command -v getenforce)" ]; then if [ -x "$(command -v getenforce)" ]; then
printf "\n::: SELinux Detected\n" printf "\n::: SELinux Detected\n"
printf ":::\tChecking for SELinux policy development packages..." printf ":::\tChecking for SELinux policy development packages..."
package_check_install "selinux-policy-devel" > /dev/null ${PKG_INSTALL} "selinux-policy-devel" > /dev/null
echo " installed!" echo " installed!"
printf ":::\tEnabling httpd server side includes (SSI).. " printf ":::\tEnabling httpd server side includes (SSI).. "
setsebool -P httpd_ssi_exec on &> /dev/null && echo "Success" || echo "SELinux not enabled" setsebool -P httpd_ssi_exec on &> /dev/null && echo "Success" || echo "SELinux not enabled"