From ab7d193f9881cf4e18e73177c7fe70e4ed5a88b1 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 22 Dec 2016 03:21:37 -0800 Subject: [PATCH] Still causing problems with Fedora and CentOS Signed-off-by: Dan Schaper --- automated install/basic-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index e5cf3f81..4da72c62 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -754,10 +754,10 @@ install_dependent_packages() { return 0 fi - #Fedora + #Fedora/CentOS for i in "${argArray1[@]}"; do echo -n "::: Checking for $i..." - if dnf -q list installed "${i}" &> /dev/null; then + if ${PKG_MANAGER} -q list installed "${i}" &> /dev/null; then echo " installed!" else echo " added to install list!" @@ -938,7 +938,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 + install_dependent_packages "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" @@ -1140,4 +1140,4 @@ main() { if [[ "${PH_TEST}" != true ]] ; then main "$@" -fi +fi \ No newline at end of file