mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
don't clear on error'
This commit is contained in:
parent
d15541a4ec
commit
9d21fb856b
2 changed files with 5 additions and 7 deletions
|
@ -42,14 +42,12 @@ echo -e "\e[1mInformation:\e[m Logging is done on \e[1m/dev/tty7\e[m..."
|
||||||
# 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
|
_new_environment | _dialog --title "${_MENU_TITLE}" --gauge "Waiting for pacman keyring..." 6 75 0 && clear
|
||||||
clear
|
|
||||||
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
|
_new_image | _dialog --title "${_MENU_TITLE}" --gauge "Removing not necessary files from /..." 6 75 0 && clear
|
||||||
clear
|
|
||||||
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
|
||||||
|
@ -66,7 +64,6 @@ 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 "Syncing package db..." 6 75 0
|
_full_system | _dialog --title "${_MENU_TITLE}" --gauge "Syncing package db..." 6 75 0 && clear
|
||||||
clear
|
|
||||||
fi
|
fi
|
||||||
rm /.update
|
rm /.update
|
||||||
|
|
|
@ -66,6 +66,7 @@ _update_installer_check() {
|
||||||
if ! [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
|
if ! [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
|
||||||
_network_check
|
_network_check
|
||||||
fi
|
fi
|
||||||
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
_gpg_check() {
|
_gpg_check() {
|
||||||
|
@ -286,7 +287,7 @@ _full_system() {
|
||||||
if [[ -e "/.full_system" ]]; then
|
if [[ -e "/.full_system" ]]; then
|
||||||
clear
|
clear
|
||||||
echo -e "\e[1mFull Arch Linux system already setup.\e[m"
|
echo -e "\e[1mFull Arch Linux system already setup.\e[m"
|
||||||
exit 0
|
exit 1
|
||||||
fi
|
fi
|
||||||
_progress "1" "${_KEEP} Refreshing pacman package database..."
|
_progress "1" "${_KEEP} Refreshing pacman package database..."
|
||||||
pacman -Sy >"${_LOG}" 2>&1 || exit 1
|
pacman -Sy >"${_LOG}" 2>&1 || exit 1
|
||||||
|
|
Loading…
Reference in a new issue