mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
[fix] Fix dependency install progress bar
This commit is contained in:
@@ -1001,12 +1001,14 @@ installer_progress_loop() {
|
||||
local i=0
|
||||
while true; do
|
||||
((i++))
|
||||
set_progress_str "$i" 'Checking that all required packages are installed and enabled...'
|
||||
set_progress_str "$i" 'Checking that all required packages are installed and enabled...' nolog
|
||||
[[ $i -gt 0 ]] && sleep 5s
|
||||
done
|
||||
}
|
||||
|
||||
installer_prereq_packages() {
|
||||
installer_progress_loop & # Run progress bar to 100 in ~8 minutes
|
||||
progress_bg_proc=$!
|
||||
|
||||
if [ "$OS" == centos ]; then
|
||||
# Print message to stdout so the user knows setup is doing something
|
||||
@@ -1042,6 +1044,13 @@ installer_prereq_packages() {
|
||||
fi
|
||||
retry 50 10 "apt-get -y install curl" >> "$setup_log" 2>&1 || exit 1
|
||||
fi
|
||||
|
||||
install_success=$?
|
||||
kill -9 "$progress_bg_proc" >> "$setup_log" 2>&1
|
||||
if [[ $install_success -gt 0 ]]; then
|
||||
echo "Could not install packages required for setup, exiting now." >> "$setup_log" 2>&1
|
||||
kill -SIGUSR1 "$setup_proc" >> "$setup_log" 2>&1; exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
disable_auto_start() {
|
||||
@@ -2369,6 +2378,7 @@ set_progress_str() {
|
||||
local percentage_input=$1
|
||||
progress_bar_text=$2
|
||||
export progress_bar_text
|
||||
local nolog=$2
|
||||
|
||||
if (( "$percentage_input" >= "$percentage" )); then
|
||||
percentage="$percentage_input"
|
||||
@@ -2378,12 +2388,14 @@ set_progress_str() {
|
||||
|
||||
echo -e "$percentage_str"
|
||||
|
||||
info "Progressing ($percentage%): $progress_bar_text"
|
||||
if [[ -z $nolog ]]; then
|
||||
info "Progressing ($percentage%): $progress_bar_text"
|
||||
|
||||
printf '%s\n' \
|
||||
'----'\
|
||||
"$percentage% - ${progress_bar_text^^}"\
|
||||
"----" >> "$setup_log" 2>&1
|
||||
# printf '%s\n' \
|
||||
# '----'\
|
||||
# "$percentage% - ${progress_bar_text^^}"\
|
||||
# "----" >> "$setup_log" 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
set_ssh_cmds() {
|
||||
|
||||
Reference in New Issue
Block a user