diff --git a/usr/lib/archboot/update/desktop.sh b/usr/lib/archboot/update/desktop.sh index 1583bd2db..8bf05c8b7 100644 --- a/usr/lib/archboot/update/desktop.sh +++ b/usr/lib/archboot/update/desktop.sh @@ -51,16 +51,16 @@ _IGNORE=() } _install_fix_packages() { - _run_pacman "${_FIX_PACKAGES[@]}" + _run_pacman "$(echo ${_FIX_PACKAGES[@]})" rm /.archboot } _install_graphic() { # check for qxl module if rg -q qxl /proc/modules; then - _GRAPHIC+="xf86-video-qxl" + _GRAPHIC+=(xf86-video-qxl) fi - _run_pacman "${_GRAPHIC[@]}" + _run_pacman "$(echo ${_GRAPHIC[@]})" rm /.archboot } @@ -130,13 +130,13 @@ _custom_wayland_xorg() { echo -e "\e[1mStep 1/2:\e[m Installing custom wayland..." echo " This will need some time..." #shellcheck disable=SC2145 - _prepare_graphic "${_WAYLAND_PACKAGE} ${_CUSTOM_WAYLAND[@]}" > "${_LOG}" 2>&1 + _prepare_graphic "${_WAYLAND_PACKAGE} $(echo ${_CUSTOM_WAYLAND[@]})" > "${_LOG}" 2>&1 fi if [[ -n "${_CUSTOM_X}" ]]; then echo -e "\e[1mStep 1/2:\e[m Installing custom xorg..." echo " This will need some time..." #shellcheck disable=SC2145 - _prepare_graphic "${_XORG_PACKAGE} ${_CUSTOM_XORG[@]}" > "${_LOG}" 2>&1 + _prepare_graphic "${_XORG_PACKAGE} $(echo ${_CUSTOM_XORG[@]})" > "${_LOG}" 2>&1 fi echo -e "\e[1mStep 2/2:\e[m Setting up browser...\e[m" command -v firefox &>"${_NO_LOG}" && _firefox_flags