From 11c0b1f660736a15a335e30de2d90f7b38eb1bb4 Mon Sep 17 00:00:00 2001
From: Eric Warnke <ericew@gmail.com>
Date: Thu, 27 Oct 2016 20:27:26 -0400
Subject: [PATCH] Jettison vestigial function, print debugging information on
 failed install

---
 automated install/basic-install.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

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