mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
smaller menu
This commit is contained in:
parent
1014c81a86
commit
a18e41d5c3
2 changed files with 7 additions and 7 deletions
|
@ -64,7 +64,7 @@ _geteditor() {
|
||||||
"NANO") _EDITOR="nano"
|
"NANO") _EDITOR="nano"
|
||||||
if ! [[ -f "${_DESTDIR}/usr/bin/nano" ]]; then
|
if ! [[ -f "${_DESTDIR}/usr/bin/nano" ]]; then
|
||||||
_PACKAGES="nano"
|
_PACKAGES="nano"
|
||||||
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0
|
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
|
||||||
_pacman_error
|
_pacman_error
|
||||||
_dialog --no-mouse --infobox "Enable nano's syntax highlighting on installed system..." 3 70
|
_dialog --no-mouse --infobox "Enable nano's syntax highlighting on installed system..." 3 70
|
||||||
grep -q '^include' "${_DESTDIR}/etc/nanorc" || \
|
grep -q '^include' "${_DESTDIR}/etc/nanorc" || \
|
||||||
|
@ -75,7 +75,7 @@ _geteditor() {
|
||||||
"NEOVIM") _EDITOR="nvim"
|
"NEOVIM") _EDITOR="nvim"
|
||||||
if ! [[ -f "${_DESTDIR}/usr/bin/nvim" ]]; then
|
if ! [[ -f "${_DESTDIR}/usr/bin/nvim" ]]; then
|
||||||
_PACKAGES="nvim"
|
_PACKAGES="nvim"
|
||||||
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0
|
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
|
||||||
_pacman_error
|
_pacman_error
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -156,7 +156,7 @@ _do_uefi_common() {
|
||||||
[[ -f "${_DESTDIR}/usr/bin/sbsign" ]] || _PACKAGES="${_PACKAGES} sbsigntools"
|
[[ -f "${_DESTDIR}/usr/bin/sbsign" ]] || _PACKAGES="${_PACKAGES} sbsigntools"
|
||||||
fi
|
fi
|
||||||
if [[ -n "${_PACKAGES}" ]]; then
|
if [[ -n "${_PACKAGES}" ]]; then
|
||||||
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0
|
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
|
||||||
_pacman_error
|
_pacman_error
|
||||||
fi
|
fi
|
||||||
# automounted /boot and ESP needs to be mounted first, trigger mount with ls
|
# automounted /boot and ESP needs to be mounted first, trigger mount with ls
|
||||||
|
@ -426,7 +426,7 @@ GUMEOF
|
||||||
_do_refind_uefi() {
|
_do_refind_uefi() {
|
||||||
if [[ ! -f "${_DESTDIR}/usr/bin/refind-install" ]]; then
|
if [[ ! -f "${_DESTDIR}/usr/bin/refind-install" ]]; then
|
||||||
_PACKAGES="refind"
|
_PACKAGES="refind"
|
||||||
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0
|
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
|
||||||
_pacman_error
|
_pacman_error
|
||||||
fi
|
fi
|
||||||
_dialog --no-mouse --infobox "Setting up rEFInd now. This needs some time..." 3 60
|
_dialog --no-mouse --infobox "Setting up rEFInd now. This needs some time..." 3 60
|
||||||
|
@ -550,12 +550,12 @@ _do_grub_common_before() {
|
||||||
_abort_f2fs_bootpart || return 1
|
_abort_f2fs_bootpart || return 1
|
||||||
if [[ ! -d "${_DESTDIR}/usr/lib/grub" ]]; then
|
if [[ ! -d "${_DESTDIR}/usr/lib/grub" ]]; then
|
||||||
_PACKAGES="grub"
|
_PACKAGES="grub"
|
||||||
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0
|
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
|
||||||
_pacman_error
|
_pacman_error
|
||||||
fi
|
fi
|
||||||
if [[ ! -f "${_DESTDIR}/usr/share/grub/ter-u16n.pf2" ]]; then
|
if [[ ! -f "${_DESTDIR}/usr/share/grub/ter-u16n.pf2" ]]; then
|
||||||
_PACKAGES=terminus-font
|
_PACKAGES=terminus-font
|
||||||
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0
|
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
|
||||||
_pacman_error
|
_pacman_error
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -1018,7 +1018,7 @@ _install_bootloader() {
|
||||||
if [[ -n "${_UCODE}" ]]; then
|
if [[ -n "${_UCODE}" ]]; then
|
||||||
if ! [[ -f "${_DESTDIR}/boot/${_UCODE}" ]]; then
|
if ! [[ -f "${_DESTDIR}/boot/${_UCODE}" ]]; then
|
||||||
_PACKAGES="${_UCODE_PKG}"
|
_PACKAGES="${_UCODE_PKG}"
|
||||||
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0
|
_run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0
|
||||||
_pacman_error
|
_pacman_error
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue