From a861801a24ec7e14ba968af3dc2f5f54c65fdd98 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 19 Jan 2022 13:38:10 -0500
Subject: [PATCH] more logCmd

---
 setup/so-functions | 47 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 968742460..78ca5d6d7 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -799,7 +799,7 @@ configure_ntp() {
 
 	# Install chrony if it isn't already installed
 	if ! command -v chronyc &> /dev/null; then
-		yum -y install chrony
+		logCmd "yum -y install chrony"
 	fi
 
 	[[ -f $chrony_conf ]] && mv $chrony_conf "$chrony_conf.bak"
@@ -1137,10 +1137,10 @@ installer_prereq_packages() {
 	if [ "$OS" == centos ]; then
 		if [[ ! $is_iso ]]; then
 			if ! yum versionlock > /dev/null 2>&1; then
-				yum -y install yum-plugin-versionlock >> "$setup_log" 2>&1
+				logCmd "yum -y install yum-plugin-versionlock"
 			fi
 			if ! command -v nmcli > /dev/null 2>&1; then
-				yum -y install NetworkManager >> "$setup_log" 2>&1
+				logCmd "yum -y install NetworkManager"
 			fi
 		fi
 		logCmd "systemctl enable NetworkManager"
@@ -1192,16 +1192,14 @@ disable_ipv6() {
 docker_install() {
 
 	if [ $OS = 'centos' ]; then
-		{
-			yum clean expire-cache;
-			if [[ ! $is_iso ]]; then
-			  yum -y install docker-ce-20.10.5-3.el7 docker-ce-cli-20.10.5-3.el7 docker-ce-rootless-extras-20.10.5-3.el7 containerd.io-1.4.4-3.1.el7
-			fi
-			yum versionlock docker-ce-20.10.5-3.el7
-			yum versionlock docker-ce-cli-20.10.5-3.el7
-			yum versionlock docker-ce-rootless-extras-20.10.5-3.el7
-			yum versionlock containerd.io-1.4.4-3.1.el7
-		} >> "$setup_log" 2>&1
+		logCmd "yum clean expire-cache"
+		if [[ ! $is_iso ]]; then
+			logCmd "yum -y install docker-ce-20.10.5-3.el7 docker-ce-cli-20.10.5-3.el7 docker-ce-rootless-extras-20.10.5-3.el7 containerd.io-1.4.4-3.1.el7"
+		fi
+		logCmd "yum versionlock docker-ce-20.10.5-3.el7"
+		logCmd "yum versionlock docker-ce-cli-20.10.5-3.el7"
+		logCmd "yum versionlock docker-ce-rootless-extras-20.10.5-3.el7"
+		logCmd "yum versionlock containerd.io-1.4.4-3.1.el7"
 		
 	else
 		case "$install_type" in
@@ -2163,7 +2161,7 @@ remove_package() {
 	local package_name=$1
 	if [ $OS = 'centos' ]; then
 		if rpm -qa | grep -q "$package_name"; then
-			yum remove -y "$package_name"
+			logCmd "yum remove -y $package_name"
 		fi
 	else
 		if dpkg -l | grep -q "$package_name"; then
@@ -2214,21 +2212,8 @@ saltify() {
 		fi
 		set_progress_str 8 'Installing salt-minion & python modules'
 			if [[ ! $is_iso ]]; then
-			  logCmd "yum -y install salt-minion-3004\
-			  	httpd-tools\
-			   	python3\
-					python36-docker\
-					python36-dateutil\
-					python36-m2crypto\
-					python36-mysql\
-					python36-packaging\
-					python36-lxml\
-					yum-utils\
-					device-mapper-persistent-data\
-					lvm2\
-					openssl\
-					jq"
-					logCmd "yum -y update --exclude=salt*"
+				logCmd "yum -y install salt-minion-3004 httpd-tools python3 python36-docker python36-dateutil python36-m2crypto python36-mysql python36-packaging python36-lxml yum-utils device-mapper-persistent-data lvm2 openssl jq"
+				logCmd "yum -y update --exclude=salt*"
 			fi
 		logCmd "systemctl enable salt-minion"
 		logCmd "yum versionlock salt*"
@@ -2769,8 +2754,8 @@ update_sudoers() {
 
 update_packages() {
 	if [ "$OS" = 'centos' ]; then
-	    yum repolist >> /dev/null
-        yum -y update --exclude=salt*,wazuh*,docker*,containerd* >> "$setup_log"
+	    logCmd "yum repolist"
+        logCmd "yum -y update --exclude=salt*,wazuh*,docker*,containerd*"
 	else
 		retry 50 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1
 		retry 50 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1