🐛 Small fixes to main install scripts
Add ask_for_sudo back to dot.sh; fix show_spinner & execute in utils.sh.
This commit is contained in:
parent
8cc3e0afd2
commit
88c9b4f1b9
2 changed files with 6 additions and 3 deletions
|
@ -290,7 +290,6 @@ restart_os()
|
||||||
printf "\n"
|
printf "\n"
|
||||||
|
|
||||||
if answer_is_yes; then
|
if answer_is_yes; then
|
||||||
ask_for_sudo
|
|
||||||
sudo shutdown -r now &> /dev/null
|
sudo shutdown -r now &> /dev/null
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -321,6 +320,10 @@ main()
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|
||||||
|
ask_for_sudo
|
||||||
|
|
||||||
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|
||||||
# Check if this script was run directly, and if not, dotfiles will need to be
|
# Check if this script was run directly, and if not, dotfiles will need to be
|
||||||
# downloaded.
|
# downloaded.
|
||||||
|
|
||||||
|
|
|
@ -164,7 +164,7 @@ show_spinner()
|
||||||
tput sc
|
tput sc
|
||||||
|
|
||||||
while kill -0 "$PID" &> /dev/null; do
|
while kill -0 "$PID" &> /dev/null; do
|
||||||
frame_text=" [${FRAMES:i++%NUMBER_OF_FRAMES:1}] $MSG"
|
frame_text=" [${FRAMES:i++%NUMBER_OF_FRAMES:1}] $MSG"
|
||||||
|
|
||||||
# Print frame text.
|
# Print frame text.
|
||||||
printf "%s" "$frame_text"
|
printf "%s" "$frame_text"
|
||||||
|
@ -237,7 +237,7 @@ execute()
|
||||||
# Print output based on what happened.
|
# Print output based on what happened.
|
||||||
print_result $exit_code "$MSG"
|
print_result $exit_code "$MSG"
|
||||||
|
|
||||||
if [[ $exit -ne 0 ]]; then
|
if [[ $exit_code -ne 0 ]]; then
|
||||||
print_error_stream < "$TMP_FILE"
|
print_error_stream < "$TMP_FILE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue