CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-28 07:28:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move whiptail menus outside of progress func

Browse Source
This commit is contained in:
William Wernert
2021-11-02 12:03:42 -04:00
parent 9671dab2a3
commit e4a77acfe6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup/so-setup
+6 -3
View File
@@ -352,12 +352,15 @@ if [[ -z $is_airgap ]]; then
progress_bg_proc=$! progress_bg_proc=$!
./so-preflight true "$setup_log" >> $setup_log 2>&1 ./so-preflight true "$setup_log" >> $setup_log 2>&1
preflight_ret=$? preflight_ret=$?
echo "$preflight_ret" > /tmp/preflight_ret
kill -9 "$progress_bg_proc" kill -9 "$progress_bg_proc"
wait "$progress_bg_proc" &> /dev/null wait "$progress_bg_proc" &> /dev/null
if [[ $preflight_ret -gt 0 ]] && ! ( whiptail_preflight_err ); then
whiptail_cancel
fi
} | progress '...' } | progress '...'
[[ -f /tmp/setup_tmp_var ]] && preflight_ret=$(cat /tmp/preflight_ret)
rm /tmp/preflight_ret
if [[ -n $preflight_ret && $preflight_ret -gt 0 ]] && ! ( whiptail_preflight_err ); then
whiptail_cancel
fi
fi fi
percentage=0 percentage=0