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

add titles

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-15 14:03:56 +02:00
parent ece6b3db53
commit 6d913ad099
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
usr/lib/archboot/installer/pacman.sh
View file

@ -26,7 +26,7 @@ _select_mirror() {
# FIXME: this regex doesn't honor commenting
_MIRRORS=$(grep -E -o '((http)|(https))://[^/]*' "${_MIRRORLIST}" | sed 's|$| _|g')
#shellcheck disable=SC2086
_dialog --cancel-label "Back" --menu "Select a mirror:" 14 55 7 \
_dialog --title " Package Mirror "--menu "" 13 55 7 \
${_MIRRORS} \
"Custom" "_" 2>${_ANSWER} || return 1
#shellcheck disable=SC2155
@ -131,7 +131,8 @@ _prepare_pacman() {
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _KEYRING="${_KEYRING} archlinuxarm-keyring"
#shellcheck disable=SC2086
if ! pacman -Sy ${_PACMAN_CONF} --noconfirm --noprogressbar ${_KEYRING} &>"${_LOG}"; then
_dialog --msgbox "Keyring update failed! Check ${_LOG} for errors." 6 60
_dialog --title " ERROR " --infobox "Keyring update failed! Check ${_LOG} for errors." 3 60
sleep 5
return 1
fi
}
@ -156,8 +157,8 @@ _run_pacman(){
_dialog --title "${_RESULT}" --exit-label "Continue" \
--textbox "/tmp/pacman.log" 18 70 || return 1
else
_dialog --infobox "Package installation complete.\nContinuing in 5 seconds..." 4 40
sleep 5
_dialog --infobox "Package installation complete." 3 40
sleep 3
fi
rm /tmp/.pacman-retcode
# ensure the disk is synced