CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix][WIP] Changes to set_progress_str to fix percentage dropping to 0

Browse Source
This commit is contained in:
William Wernert
2020-05-19 09:32:10 -04:00
parent 8957af0a4d
commit 2261fe9b66
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/so-functions
View File

@@ -1212,20 +1212,18 @@ setup_salt_master_dirs() {
} }
set_progress_str() { set_progress_str() {
local percentage_input local percentage_input=$1
percentage_input=$1 local progress_bar_text=$2
local progress_bar_text
progress_bar_text=$2
if [ "$percentage_input" -gt "$percentage" ]; then if [[ $percentage_input -ge $percentage ]]; then
percentage="$percentage_input" export percentage="$percentage_input"
fi 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" 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 sleep 5
} }

3
setup/so-setup
View File

@@ -272,10 +272,9 @@ if [[ $is_minion ]]; then
fi fi
# Begin install # Begin install
{
# Set initial percentage to 0 # Set initial percentage to 0
export percentage=0 export percentage=0
{
if [[ $is_sensor || $is_helix ]]; then if [[ $is_sensor || $is_helix ]]; then
set_progress_str 1 'Creating bond interface' set_progress_str 1 'Creating bond interface'