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

[fix] Change text printed to whiptail progress bar

Browse Source
This commit is contained in:
William Wernert
2020-12-28 14:29:03 -05:00
parent a4239d7fe4
commit 5836d22525
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,8 +146,7 @@ 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 lock' local lock_msg="Could not acquire lock, waiting $retry_timeout for lock to release."
local retry_msg="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..."
@@ -161,9 +160,9 @@ wait_for_apt() {
echo "Attempting to acquire dpkg lock to run apt command... (Attempt $count/$retry_count)" echo "Attempting to acquire dpkg lock to run apt command... (Attempt $count/$retry_count)"
if __check_apt_lock; then if __check_apt_lock; then
if [[ -z $progress_callback ]]; then if [[ -z $progress_callback ]]; then
echo " $lock_msg, $retry_msg" echo " $lock_msg"
else else
$progress_callback "$retry_msg" $progress_callback "$lock_msg"
fi fi
else else
[[ -z $progress_callback ]] || $progress_callback "$old_text" [[ -z $progress_callback ]] || $progress_callback "$old_text"