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

[fix] Fix text printed to whiptail progress bar

Browse Source
This commit is contained in:
William Wernert
2020-12-28 15:06:03 -05:00
parent cdb6dfcea0
commit 97466957a7
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/common/tools/sbin/so-common
View File

@@ -147,8 +147,8 @@ wait_for_apt() {
local retry_count=30 local retry_count=30
local retry_timeout='10s' local retry_timeout='10s'
local lock_msg="Could not acquire dpkg lock, waiting $retry_timeout for lock to release." local lock_msg="Could not acquire dpkg lock, waiting $retry_timeout for lock to release."
if [ -z "$progress_callback" ]; then if [[ -z $progress_callback ]]; then
if [ -z "$progress_bar_text" ]; then if [[ -z $progress_bar_text ]]; then
local old_text="Installing..." local old_text="Installing..."
else else
local old_text="$progress_bar_text" local old_text="$progress_bar_text"
@@ -162,7 +162,7 @@ wait_for_apt() {
if [[ -z $progress_callback ]]; then if [[ -z $progress_callback ]]; then
echo " $lock_msg" | tee -a "$setup_log" echo " $lock_msg" | tee -a "$setup_log"
else else
$progress_callback "$lock_msg (Attempt $count/$retry_count)" $progress_callback "Could not acquire dpkg lock, waiting $retry_timeout ($count/$retry_count)"
fi fi
else else
[[ -z $progress_callback ]] || $progress_callback "$old_text" [[ -z $progress_callback ]] || $progress_callback "$old_text"

3
setup/so-functions
View File

@@ -1927,7 +1927,8 @@ setup_salt_master_dirs() {
set_progress_str() { set_progress_str() {
local percentage_input=$1 local percentage_input=$1
local progress_bar_text=$2 progress_bar_text=$2
export progress_bar_text
if (( "$percentage_input" >= "$percentage" )); then if (( "$percentage_input" >= "$percentage" )); then
percentage="$percentage_input" percentage="$percentage_input"