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] Fix whiptail output

Browse Source
This commit is contained in:
William Wernert
2020-12-28 14:55:15 -05:00
parent 5059373485
commit cdb6dfcea0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,10 +157,10 @@ wait_for_apt() {
local count=0 local count=0
while [[ "$count" -lt "$retry_count" ]]; do while [[ "$count" -lt "$retry_count" ]]; do
((count++)) ((count++))
echo "Attempting to acquire dpkg lock to run apt command... (Attempt $count/$retry_count)" [[ -z $progress_callback ]] && 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" echo " $lock_msg" | tee -a "$setup_log"
else else
$progress_callback "$lock_msg (Attempt $count/$retry_count)" $progress_callback "$lock_msg (Attempt $count/$retry_count)"
fi fi
@@ -172,9 +172,7 @@ wait_for_apt() {
done done
if __check_apt_lock; then if __check_apt_lock; then
if [[ -z $progress_callback ]]; then [[ -z $progress_callback ]] && echo "Could not acquire lock after $retry_count attempts, aborting."
echo "Could not acquire lock after $retry_count attempts, aborting."
fi
return 1 return 1
else else
return 0 return 0