From 2261fe9b660b94a6ab255568ef449e90871f5ebe Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 19 May 2020 09:32:10 -0400
Subject: [PATCH 1/3] [fix][WIP] Changes to set_progress_str to fix percentage
 dropping to 0

---
 setup/so-functions | 14 ++++++--------
 setup/so-setup     |  5 ++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 69b282961..ec85bf3d6 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1212,20 +1212,18 @@ setup_salt_master_dirs() {
 }
 
 set_progress_str() {
-	local percentage_input
-	percentage_input=$1
-	local progress_bar_text
-	progress_bar_text=$2
+	local percentage_input=$1
+	local progress_bar_text=$2
 
-	if [ "$percentage_input" -gt "$percentage" ]; then
-		percentage="$percentage_input"
+	if [[ $percentage_input -ge $percentage ]]; then
+		export percentage="$percentage_input"
 	fi
 
-	percentage_str="XXX\n${percentage}\n${progress_bar_text}\nXXX"
+	percentage_str="XXX\n${percentage}\n${progress_bar_text}\nXXX\n"
 
 	echo -e "$percentage_str"
 
-	printf '%s\n' '----' "${progress_bar_text^^}" "----" >> "$setup_log" 2>&1
+	printf '%s\n' '----' "$percentage\% - ${progress_bar_text^^}" "----" >> "$setup_log" 2>&1
 	
 	sleep 5
 }
diff --git a/setup/so-setup b/setup/so-setup
index 39fcae904..306049cd6 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -272,10 +272,9 @@ if [[ $is_minion ]]; then
 fi
 
 # Begin install
-
-# Set initial percentage to 0
-export percentage=0
 {
+	# Set initial percentage to 0
+	export percentage=0
 
 	if [[ $is_sensor || $is_helix ]]; then
 		set_progress_str 1 'Creating bond interface'

From 84952d5aa6365ce9adfd5312c29cc1b389719620 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 19 May 2020 09:56:59 -0400
Subject: [PATCH 2/3] [fix][WIP] Revert parts of2261fe9

---
 setup/so-functions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index ec85bf3d6..c435ab701 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1065,7 +1065,7 @@ saltify() {
 				openssl\
 				jq;
 			yum -y update exclude=salt*;
-			systemctl enable salt-minion
+			systemctl enable salt-minion;
 		} >> "$setup_log" 2>&1
 		echo "exclude=salt*" >> /etc/yum.conf
 	else
@@ -1216,14 +1216,14 @@ set_progress_str() {
 	local progress_bar_text=$2
 
 	if [[ $percentage_input -ge $percentage ]]; then
-		export percentage="$percentage_input"
+		percentage="$percentage_input"
 	fi
 
 	percentage_str="XXX\n${percentage}\n${progress_bar_text}\nXXX\n"
 
 	echo -e "$percentage_str"
 
-	printf '%s\n' '----' "$percentage\% - ${progress_bar_text^^}" "----" >> "$setup_log" 2>&1
+	printf '%s\n' '----' "$percentage% - ${progress_bar_text^^}" "----" >> "$setup_log" 2>&1
 	
 	sleep 5
 }

From c8be95646ca3b28c4097c76b3483d8d5aaf6e42d Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 19 May 2020 10:22:14 -0400
Subject: [PATCH 3/3] [fix] Remove newline in percentage string to fix printing

---
 setup/so-functions | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index c435ab701..5bb232bf7 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1215,15 +1215,18 @@ set_progress_str() {
 	local percentage_input=$1
 	local progress_bar_text=$2
 
-	if [[ $percentage_input -ge $percentage ]]; then
+	if (( "$percentage_input" >= "$percentage" )); then
 		percentage="$percentage_input"
 	fi
 
-	percentage_str="XXX\n${percentage}\n${progress_bar_text}\nXXX\n"
+	percentage_str="XXX\n${percentage}\n${progress_bar_text}\nXXX"
 
 	echo -e "$percentage_str"
 
-	printf '%s\n' '----' "$percentage% - ${progress_bar_text^^}" "----" >> "$setup_log" 2>&1
+	printf '%s\n' \
+	'----'\
+	"$percentage% - ${progress_bar_text^^}"\
+	"----" >> "$setup_log" 2>&1
 	
 	sleep 5
 }