Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the reboot countdown after a kernel upgrade showing remaining seconds in real time #169

Merged
merged 10 commits into from
May 19, 2024
Merged

Make the reboot countdown after a kernel upgrade showing remaining seconds in real time #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7e3fcdb
Make the reboot countdown after a kernel upgrade showing remaining se…
Antiz96 May 19, 2024
15166c4
Add the necessary -n option to echo
Antiz96 May 19, 2024
b09d4a6
Don't use main msg functions
Antiz96 May 19, 2024
9755b81
Hide cursor during the countdown
Antiz96 May 19, 2024
114f3d7
Ignore shellcheck disable=SC2317 which incorrectly believe that code …
Antiz96 May 19, 2024
13c20c3
Ignore shellcheck SC2329 which incorrectly believe that code is unrea…
Antiz96 May 19, 2024
323c4dc
Fix shellcheck
Antiz96 May 19, 2024
e63e2af
Update translation files
Antiz96 May 19, 2024
81be7ef
Ignore SC2034 which wrongly see the sec var as unused because it is e…
Antiz96 May 19, 2024
7d8c8e0
Ignore SC2034 which wrongly see the sec var as unused because it is e…
Antiz96 May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions po/arch-update.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,38 +423,38 @@ msgstr ""
msgid "Would you like to reboot now? [y/N]"
msgstr ""

#: src/script/arch-update.sh:609
#: src/script/arch-update.sh:616
#, sh-format
msgid "Rebooting in 5 seconds...\\nPress ctrl+c to abort"
msgid "Rebooting in ${sec}...\\r"
msgstr ""

#: src/script/arch-update.sh:613
#: src/script/arch-update.sh:622
#, sh-format
msgid ""
"An error has occurred during the reboot process\\nThe reboot has been "
"aborted\\n"
msgstr ""

#: src/script/arch-update.sh:621
#: src/script/arch-update.sh:630
#, sh-format
msgid ""
"The reboot hasn't been performed\\nPlease, consider rebooting to finalize "
"the pending kernel update\\n"
msgstr ""

#: src/script/arch-update.sh:625
#: src/script/arch-update.sh:634
#, sh-format
msgid "No pending kernel update found\\n"
msgstr ""

#: src/script/arch-update.sh:673
#: src/script/arch-update.sh:682
#, sh-format
msgid ""
"The '${config_file}' configuration file already exists\\nPlease, remove it "
"before generating a new one"
msgstr ""

#: src/script/arch-update.sh:678
#: src/script/arch-update.sh:687
#, sh-format
msgid "The '${config_file}' configuration file has been generated"
msgstr ""
Expand Down
16 changes: 8 additions & 8 deletions po/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,12 +452,12 @@ msgstr ""
msgid "Would you like to reboot now? [y/N]"
msgstr "Voulez-vous redémarrer votre système maintenant ? [o/N]"

#: src/script/arch-update.sh:609
#: src/script/arch-update.sh:616
#, sh-format
msgid "Rebooting in 5 seconds...\\nPress ctrl+c to abort"
msgstr "Redémarrage dans 5 secondes...\\nAppuyez sur ctrl+c pour annuler"
msgid "Rebooting in ${sec}...\\r"
msgstr "Redémarrage dans ${sec}...\\r"

#: src/script/arch-update.sh:613
#: src/script/arch-update.sh:622
#, sh-format
msgid ""
"An error has occurred during the reboot process\\nThe reboot has been "
Expand All @@ -466,7 +466,7 @@ msgstr ""
"Une erreur est survenue pendant le processus de redémarrage\\nLe redémarrage a été "
"abandonné\\n"

#: src/script/arch-update.sh:621
#: src/script/arch-update.sh:630
#, sh-format
msgid ""
"The reboot hasn't been performed\\nPlease, consider rebooting to finalize "
Expand All @@ -475,12 +475,12 @@ msgstr ""
"Le redémarrage n'a pas été effectué\\nVeuillez considérer redémarrer votre système pour finaliser "
"la mise à jour du noyau en attente\\n"

#: src/script/arch-update.sh:625
#: src/script/arch-update.sh:634
#, sh-format
msgid "No pending kernel update found\\n"
msgstr "Aucune mise à jour du noyau en attente n'a été trouvée\\n"

#: src/script/arch-update.sh:673
#: src/script/arch-update.sh:682
#, sh-format
msgid ""
"The '${config_file}' configuration file already exists\\nPlease, remove it "
Expand All @@ -489,7 +489,7 @@ msgstr ""
"Le fichier de configuration '${config_file}' existe déjà.\\nVeuillez le supprimer "
"avant d'en générer un nouveau"

#: src/script/arch-update.sh:678
#: src/script/arch-update.sh:687
#, sh-format
msgid "The '${config_file}' configuration file has been generated"
msgstr "Le fichier de configuration '${config_file}' a été généré"
Expand Down
14 changes: 12 additions & 2 deletions src/script/arch-update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,8 +606,18 @@ kernel_reboot() {
case "${answer}" in
"$(eval_gettext "Y")"|"$(eval_gettext "y")")
echo
main_msg "$(eval_gettext "Rebooting in 5 seconds...\nPress ctrl+c to abort")"
sleep 5

# shellcheck disable=SC2317,SC2329
restore_cursor() {
tput cnorm
}
trap restore_cursor EXIT
# shellcheck disable=SC2034
for sec in {5..1}; do
tput civis ; echo -ne "${blue}==>${color_off}${bold} $(eval_gettext "Rebooting in \${sec}...\r")${color_off}"
sleep 1
done

if ! reboot; then
echo
error_msg "$(eval_gettext "An error has occurred during the reboot process\nThe reboot has been aborted\n")" && quit_msg
Expand Down