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

dialog syntax fixes

Browse source
This commit is contained in:
Tobias Powalowski 2024-09-08 16:40:46 +02:00
parent 5edffd9f33
commit 2286c1d3d9
8 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr/lib/archboot/installer/base.sh
View file

@ -34,8 +34,8 @@ _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)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
_dialog --no-mouse --title " Autoconfiguration " --infobox "Enable nano's syntax highlighting on installed system..." 3 70 _dialog --no-mouse --title " Autoconfiguration " --infobox "Enable nano's syntax highlighting on installed system..." 3 70
rg -q '^include' "${_DESTDIR}/etc/nanorc" || \ rg -q '^include' "${_DESTDIR}/etc/nanorc" || \
@ -46,8 +46,8 @@ _geteditor() {
"NEOVIM") _EDITOR="nvim" "NEOVIM") _EDITOR="nvim"
if ! [[ -f "${_DESTDIR}/usr/bin/nvim" ]]; then if ! [[ -f "${_DESTDIR}/usr/bin/nvim" ]]; then
_PACKAGES=(neovim) _PACKAGES=(neovim)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi fi
;; ;;

8
usr/lib/archboot/installer/bootloader.sh
View file

@ -142,8 +142,8 @@ _uefi_common() {
fi fi
#shellcheck disable=SC2128 #shellcheck disable=SC2128
if [[ -n "${_PACKAGES}" ]]; then if [[ -n "${_PACKAGES}" ]]; then
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_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
@ -248,8 +248,8 @@ _install_bootloader() {
if ! [[ -f "${_DESTDIR}/boot/${_UCODE}" ]]; then if ! [[ -f "${_DESTDIR}/boot/${_UCODE}" ]]; then
#shellcheck disable=SC2206 #shellcheck disable=SC2206
_PACKAGES=(${_UCODE_PKG}) _PACKAGES=(${_UCODE_PKG})
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi fi
fi fi

8
usr/lib/archboot/installer/bootloader_grub.sh
View file

@ -27,14 +27,14 @@ _grub_common_before() {
_abort_bcachefs_bootpart || return 1 _abort_bcachefs_bootpart || return 1
if [[ ! -d "${_DESTDIR}/usr/lib/grub" ]]; then if [[ ! -d "${_DESTDIR}/usr/lib/grub" ]]; then
_PACKAGES=(grub) _PACKAGES=(grub)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_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)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi fi
} }

4
usr/lib/archboot/installer/bootloader_limine.sh
View file

@ -4,8 +4,8 @@
_limine_common() { _limine_common() {
if [[ ! -f "${_DESTDIR}/usr/bin/limine" ]]; then if [[ ! -f "${_DESTDIR}/usr/bin/limine" ]]; then
_PACKAGES=(limine) _PACKAGES=(limine)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi fi
} }

4
usr/lib/archboot/installer/bootloader_refind.sh
View file

@ -4,8 +4,8 @@
_refind_uefi() { _refind_uefi() {
if [[ ! -f "${_DESTDIR}/usr/bin/refind-install" ]]; then if [[ ! -f "${_DESTDIR}/usr/bin/refind-install" ]]; then
_PACKAGES=(refind) _PACKAGES=(refind)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi fi
_dialog --no-mouse --infobox "Setting up rEFInd now..." 3 60 _dialog --no-mouse --infobox "Setting up rEFInd now..." 3 60

4
usr/lib/archboot/installer/bootloader_uki.sh
View file

@ -37,8 +37,8 @@ _uki_install() {
_uki_uefi() { _uki_uefi() {
if [[ ! -f "${_DESTDIR}/usr/lib/systemd/ukify" ]]; then if [[ ! -f "${_DESTDIR}/usr/lib/systemd/ukify" ]]; then
_PACKAGES=(systemd-ukify) _PACKAGES=(systemd-ukify)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi fi
_uki_config _uki_config

8
usr/lib/archboot/installer/configuration.sh
View file

@ -142,17 +142,17 @@ _user_management() {
"BASH") _SHELL="bash" "BASH") _SHELL="bash"
if ! [[ -f "${_DESTDIR}/usr/share/bash-completion/completions/arch" ]]; then if ! [[ -f "${_DESTDIR}/usr/share/bash-completion/completions/arch" ]]; then
_PACKAGES=(bash-completion) _PACKAGES=(bash-completion)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " \ _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " \
--gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi ;; fi ;;
"ZSH") _SHELL="zsh" "ZSH") _SHELL="zsh"
if ! [[ -f "${_DESTDIR}/usr/bin/zsh" ]]; then if ! [[ -f "${_DESTDIR}/usr/bin/zsh" ]]; then
_PACKAGES=(grml-zsh-config) _PACKAGES=(grml-zsh-config)
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " \ _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " \
--gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0
_pacman_error _pacman_error
fi ;; fi ;;
esac esac

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

@ -16,8 +16,8 @@ _run_pacman(){
[[ ! -d "${_DESTDIR}${_PACMAN_LIB}" ]] && mkdir -p "${_DESTDIR}${_PACMAN_LIB}" [[ ! -d "${_DESTDIR}${_PACMAN_LIB}" ]] && mkdir -p "${_DESTDIR}${_PACMAN_LIB}"
: > /.archboot : > /.archboot
_pacman & _pacman &
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_progress_wait "0" "99" "Installing package(s):\n${_PACKAGES[@]}..." "2" _progress_wait "0" "99" "Installing package(s):\n$(echo ${_PACKAGES[@]})..." "2"
# pacman finished, display scrollable output # pacman finished, display scrollable output
if [[ -e "/tmp/.pacman-success" ]]; then if [[ -e "/tmp/.pacman-success" ]]; then
_progress "100" "Package installation complete." 6 75 _progress "100" "Package installation complete." 6 75
@ -65,10 +65,10 @@ _install_packages() {
# add packages from Archboot defaults # add packages from Archboot defaults
. /etc/archboot/defaults . /etc/archboot/defaults
_auto_packages _auto_packages
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_dialog --title " Summary " --yesno "Next step will install the following packages for a minimal system:\n${_PACKAGES[@]}\n\nYou can watch the progress on your ${_VC} console." 9 75 || return 1 _dialog --title " Summary " --yesno "Next step will install the following packages for a minimal system:\n$(echo ${_PACKAGES[@]})\n\nYou can watch the progress on your ${_VC} console." 9 75 || return 1
#shellcheck disable=SC2145 #shellcheck disable=SC2116,SC2068
_run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 8 75 0 _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 8 75 0
_pacman_error || return 1 _pacman_error || return 1
_NEXTITEM=3 _NEXTITEM=3
_chroot_mount _chroot_mount