root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add end_check

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-02 19:19:52 +02:00
parent 57da95b47b
commit 5a9d8395c8
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
usr/bin/archboot-update.sh
View file

@ -41,14 +41,14 @@ _download_latest
# Generate new environment and launch it with kexec # Generate new environment and launch it with kexec
if [[ -n "${_L_COMPLETE}" || -n "${_L_INSTALL_COMPLETE}" ]]; then if [[ -n "${_L_COMPLETE}" || -n "${_L_INSTALL_COMPLETE}" ]]; then
_TITLE="Archboot $(uname -m) | Basic Setup | New Environment" _TITLE="Archboot $(uname -m) | Basic Setup | New Environment"
_new_environment | _dialog --title "${_MENU_TITLE}" --gauge "Waiting for pacman keyring..." 6 75 0 || exit 1 _new_environment | _dialog --title "${_MENU_TITLE}" --gauge "Waiting for pacman keyring..." 6 75 0
clear _end_check
fi fi
# Generate new images # Generate new images
if [[ -n "${_G_RELEASE}" ]]; then if [[ -n "${_G_RELEASE}" ]]; then
_TITLE="Archboot $(uname -m) | Basic Setup | New Images" _TITLE="Archboot $(uname -m) | Basic Setup | New Images"
_new_image | _dialog --title "${_MENU_TITLE}" --gauge "Removing not necessary files from /..." 6 75 0 || exit 1 _new_image | _dialog --title "${_MENU_TITLE}" --gauge "Removing not necessary files from /..." 6 75 0
clear _end_check
fi fi
# install custom xorg or wayland # install custom xorg or wayland
if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WAYLAND}" ]]; then if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WAYLAND}" ]]; then
@ -65,7 +65,7 @@ fi
# Switch to full Arch Linux system # Switch to full Arch Linux system
if [[ -n "${_FULL_SYSTEM}" ]]; then if [[ -n "${_FULL_SYSTEM}" ]]; then
_TITLE="Archboot $(uname -m) | Basic Setup | Full System" _TITLE="Archboot $(uname -m) | Basic Setup | Full System"
_full_system | _dialog --title "${_MENU_TITLE}" --gauge "Refreshing pacman package database..." 6 75 0 || exit 1 _full_system | _dialog --title "${_MENU_TITLE}" --gauge "Refreshing pacman package database..." 6 75 0
clear _end_check
fi fi
rm /.update rm /.update

9
usr/lib/archboot/update/manage.sh
View file

@ -72,6 +72,15 @@ _full_system_check() {
fi fi
} }
_end_check() {
if [[ -e /.update ]]; then
clear
else
clear
exit 1
fi
}
_gpg_check() { _gpg_check() {
# pacman-key process itself # pacman-key process itself
while pgrep -x pacman-key &>"${_NO_LOG}"; do while pgrep -x pacman-key &>"${_NO_LOG}"; do