[fix][WIP] Revert parts of2261fe9

This commit is contained in:
William Wernert
2020-05-19 09:56:59 -04:00
parent 2261fe9b66
commit 84952d5aa6

View File

@@ -1065,7 +1065,7 @@ saltify() {
openssl\ openssl\
jq; jq;
yum -y update exclude=salt*; yum -y update exclude=salt*;
systemctl enable salt-minion systemctl enable salt-minion;
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
echo "exclude=salt*" >> /etc/yum.conf echo "exclude=salt*" >> /etc/yum.conf
else else
@@ -1216,14 +1216,14 @@ set_progress_str() {
local progress_bar_text=$2 local progress_bar_text=$2
if [[ $percentage_input -ge $percentage ]]; then if [[ $percentage_input -ge $percentage ]]; then
export percentage="$percentage_input" percentage="$percentage_input"
fi fi
percentage_str="XXX\n${percentage}\n${progress_bar_text}\nXXX\n" percentage_str="XXX\n${percentage}\n${progress_bar_text}\nXXX\n"
echo -e "$percentage_str" echo -e "$percentage_str"
printf '%s\n' '----' "$percentage\% - ${progress_bar_text^^}" "----" >> "$setup_log" 2>&1 printf '%s\n' '----' "$percentage% - ${progress_bar_text^^}" "----" >> "$setup_log" 2>&1
sleep 5 sleep 5
} }