diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 0225154..51bdeb6 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -39,10 +39,10 @@ dpkg-reconfigure tzdata #Install shared packages DEBIAN_FRONTEND=noninteractive apt install -y ${base_debs_download[@]} DEBIAN_FRONTEND=noninteractive apt install -y ${mesa_debs_download[@]} -DEBIAN_FRONTEND=noninteractive apt install -y ${prawnos_debs_prebuilt[@]} +DEBIAN_FRONTEND=noninteractive apt install -y ${prawnos_base_debs_prebuilt_download[@]} [ "$DE" = "gnome" ] && apt install -y ${gnome_debs_download[@]} -[ "$DE" = "xfce" ] && apt install -y ${xfce_debs_download[@]} +[ "$DE" = "xfce" ] && apt install -y ${xfce_debs_download[@]} ${prawnos_base_debs_prebuilt_install[@]} [ "$DE" = "lxqt" ] && apt install -y ${lxqt_debs_download[@]} #install the keymap by patching xkb, then bindings work for any desktop environment diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index ec96cf8..5c6dc8a 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -123,8 +123,9 @@ fi # install Debian on it export DEBIAN_FRONTEND=noninteractive # need ca-certs, gnupg, openssl to handle https apt links and key adding for deb.prawnos.com +printf -v debootstrap_debs_install_joined '%s,' "${debootstrap_debs_install[@]}" qemu-debootstrap --arch armhf $DEBIAN_SUITE \ - --include ${base_debs_download[@]} \ + --include ${debootstrap_debs_install_joined%,} \ --keyring=$build_resources/debian-archive-keyring.gpg \ $outmnt \ $PRAWNOS_DEBOOTSTRAP_MIRROR \