diff --git a/usr/lib/archboot/installer/base.sh b/usr/lib/archboot/installer/base.sh index 110c80af7..aac47da07 100644 --- a/usr/lib/archboot/installer/base.sh +++ b/usr/lib/archboot/installer/base.sh @@ -34,8 +34,8 @@ _geteditor() { "NANO") _EDITOR="nano" if ! [[ -f "${_DESTDIR}/usr/bin/nano" ]]; then _PACKAGES=(nano) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error _dialog --no-mouse --title " Autoconfiguration " --infobox "Enable nano's syntax highlighting on installed system..." 3 70 rg -q '^include' "${_DESTDIR}/etc/nanorc" || \ @@ -46,8 +46,8 @@ _geteditor() { "NEOVIM") _EDITOR="nvim" if ! [[ -f "${_DESTDIR}/usr/bin/nvim" ]]; then _PACKAGES=(neovim) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi ;; diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh index 7e18d6369..bc8831aea 100644 --- a/usr/lib/archboot/installer/bootloader.sh +++ b/usr/lib/archboot/installer/bootloader.sh @@ -142,8 +142,8 @@ _uefi_common() { fi #shellcheck disable=SC2128 if [[ -n "${_PACKAGES}" ]]; then - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi # 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 #shellcheck disable=SC2206 _PACKAGES=(${_UCODE_PKG}) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi fi diff --git a/usr/lib/archboot/installer/bootloader_grub.sh b/usr/lib/archboot/installer/bootloader_grub.sh index 698596289..199b689e1 100644 --- a/usr/lib/archboot/installer/bootloader_grub.sh +++ b/usr/lib/archboot/installer/bootloader_grub.sh @@ -27,14 +27,14 @@ _grub_common_before() { _abort_bcachefs_bootpart || return 1 if [[ ! -d "${_DESTDIR}/usr/lib/grub" ]]; then _PACKAGES=(grub) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi if [[ ! -f "${_DESTDIR}/usr/share/grub/ter-u16n.pf2" ]]; then _PACKAGES=(terminus-font) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi } diff --git a/usr/lib/archboot/installer/bootloader_limine.sh b/usr/lib/archboot/installer/bootloader_limine.sh index 22c9a2c6a..cd8f0a88f 100644 --- a/usr/lib/archboot/installer/bootloader_limine.sh +++ b/usr/lib/archboot/installer/bootloader_limine.sh @@ -4,8 +4,8 @@ _limine_common() { if [[ ! -f "${_DESTDIR}/usr/bin/limine" ]]; then _PACKAGES=(limine) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi } diff --git a/usr/lib/archboot/installer/bootloader_refind.sh b/usr/lib/archboot/installer/bootloader_refind.sh index c0c660673..8cf62cc4a 100644 --- a/usr/lib/archboot/installer/bootloader_refind.sh +++ b/usr/lib/archboot/installer/bootloader_refind.sh @@ -4,8 +4,8 @@ _refind_uefi() { if [[ ! -f "${_DESTDIR}/usr/bin/refind-install" ]]; then _PACKAGES=(refind) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi _dialog --no-mouse --infobox "Setting up rEFInd now..." 3 60 diff --git a/usr/lib/archboot/installer/bootloader_uki.sh b/usr/lib/archboot/installer/bootloader_uki.sh index 6962d3be6..1dbd0c771 100644 --- a/usr/lib/archboot/installer/bootloader_uki.sh +++ b/usr/lib/archboot/installer/bootloader_uki.sh @@ -37,8 +37,8 @@ _uki_install() { _uki_uefi() { if [[ ! -f "${_DESTDIR}/usr/lib/systemd/ukify" ]]; then _PACKAGES=(systemd-ukify) - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 7 75 0 + #shellcheck disable=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 7 75 0 _pacman_error fi _uki_config diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh index d594be897..f9b9ce111 100644 --- a/usr/lib/archboot/installer/configuration.sh +++ b/usr/lib/archboot/installer/configuration.sh @@ -142,17 +142,17 @@ _user_management() { "BASH") _SHELL="bash" if ! [[ -f "${_DESTDIR}/usr/share/bash-completion/completions/arch" ]]; then _PACKAGES=(bash-completion) - #shellcheck disable=SC2145 + #shellcheck disable=SC2116,SC2068 _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 fi ;; "ZSH") _SHELL="zsh" if ! [[ -f "${_DESTDIR}/usr/bin/zsh" ]]; then _PACKAGES=(grml-zsh-config) - #shellcheck disable=SC2145 + #shellcheck disable=SC2116,SC2068 _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 fi ;; esac diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh index eb5c661a2..411792436 100644 --- a/usr/lib/archboot/installer/pacman.sh +++ b/usr/lib/archboot/installer/pacman.sh @@ -16,8 +16,8 @@ _run_pacman(){ [[ ! -d "${_DESTDIR}${_PACMAN_LIB}" ]] && mkdir -p "${_DESTDIR}${_PACMAN_LIB}" : > /.archboot _pacman & - #shellcheck disable=SC2145 - _progress_wait "0" "99" "Installing package(s):\n${_PACKAGES[@]}..." "2" + #shellcheck disable=SC2116,SC2068 + _progress_wait "0" "99" "Installing package(s):\n$(echo ${_PACKAGES[@]})..." "2" # pacman finished, display scrollable output if [[ -e "/tmp/.pacman-success" ]]; then _progress "100" "Package installation complete." 6 75 @@ -65,10 +65,10 @@ _install_packages() { # add packages from Archboot defaults . /etc/archboot/defaults _auto_packages - #shellcheck disable=SC2145 - _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 - #shellcheck disable=SC2145 - _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES[@]}..." 8 75 0 + #shellcheck disable=SC2116,SC2068 + _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=SC2116,SC2068 + _run_pacman | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Installing package(s):\n$(echo ${_PACKAGES[@]})..." 8 75 0 _pacman_error || return 1 _NEXTITEM=3 _chroot_mount