mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
add end_check
This commit is contained in:
parent
57da95b47b
commit
5a9d8395c8
2 changed files with 15 additions and 6 deletions
|
@ -41,14 +41,14 @@ _download_latest
|
|||
# Generate new environment and launch it with kexec
|
||||
if [[ -n "${_L_COMPLETE}" || -n "${_L_INSTALL_COMPLETE}" ]]; then
|
||||
_TITLE="Archboot $(uname -m) | Basic Setup | New Environment"
|
||||
_new_environment | _dialog --title "${_MENU_TITLE}" --gauge "Waiting for pacman keyring..." 6 75 0 || exit 1
|
||||
clear
|
||||
_new_environment | _dialog --title "${_MENU_TITLE}" --gauge "Waiting for pacman keyring..." 6 75 0
|
||||
_end_check
|
||||
fi
|
||||
# Generate new images
|
||||
if [[ -n "${_G_RELEASE}" ]]; then
|
||||
_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
|
||||
clear
|
||||
_new_image | _dialog --title "${_MENU_TITLE}" --gauge "Removing not necessary files from /..." 6 75 0
|
||||
_end_check
|
||||
fi
|
||||
# install custom xorg or wayland
|
||||
if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WAYLAND}" ]]; then
|
||||
|
@ -65,7 +65,7 @@ fi
|
|||
# Switch to full Arch Linux system
|
||||
if [[ -n "${_FULL_SYSTEM}" ]]; then
|
||||
_TITLE="Archboot $(uname -m) | Basic Setup | Full System"
|
||||
_full_system | _dialog --title "${_MENU_TITLE}" --gauge "Refreshing pacman package database..." 6 75 0 || exit 1
|
||||
clear
|
||||
_full_system | _dialog --title "${_MENU_TITLE}" --gauge "Refreshing pacman package database..." 6 75 0
|
||||
_end_check
|
||||
fi
|
||||
rm /.update
|
||||
|
|
|
@ -72,6 +72,15 @@ _full_system_check() {
|
|||
fi
|
||||
}
|
||||
|
||||
_end_check() {
|
||||
if [[ -e /.update ]]; then
|
||||
clear
|
||||
else
|
||||
clear
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
_gpg_check() {
|
||||
# pacman-key process itself
|
||||
while pgrep -x pacman-key &>"${_NO_LOG}"; do
|
||||
|
|
Loading…
Reference in a new issue