diff --git a/Amelia.sh b/Amelia.sh index 6068b7c..dda0a2d 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # Source: https://gitlab.com/prism7/archery -# Version: 1.1.5 +# Version: 1.1.6 set -euo pipefail ################################################################################################### @@ -2126,7 +2126,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Deskt [12] Custom Arch Linux - [13] Cosmic ${red}## ${yellow}Beta ${red}## " + [13] Cosmic " BLUE " @@ -2512,13 +2512,15 @@ Enter [y/N]: " case "${printer}" in y) + collect_print_pkgs=(bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan system-config-printer xdg-utils colord) + if [[ "${desktop}" == "2" ]]; then - print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan print-manager skanlite system-config-printer xdg-utils colord" + collect_print_pkgs+=(print-manager skanlite) elif [[ "${desktop}" == "4" ]]; then - print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan simple-scan system-config-printer xdg-utils colord" - else - print_pkgs="bluez-cups cups-pdf cups-browsed cups-pk-helper foomatic-db-gutenprint-ppds gutenprint ipp-usb libusb nss-mdns sane-airscan system-config-printer xdg-utils colord" - fi ;; + collect_print_pkgs+=(simple-scan) + fi + + print_pkgs="${collect_print_pkgs[*]}" ;; n) print_pkgs="" skip ;; @@ -6198,7 +6200,7 @@ pkg_collection() { deskpkgs="${custarray[*]}" ;; 13) # Cosmic Desktop: - deskpkgs="${basepkgs[*]} cosmic cosmic-player dconf gnome-keyring gvfs gvfs-dnssd gvfs-nfs gvfs-smb packagekit power-profiles-daemon pulseaudio-alsa" + deskpkgs="${basepkgs[*]} cosmic dconf gnome-keyring gvfs gvfs-dnssd gvfs-nfs gvfs-smb packagekit power-profiles-daemon pulseaudio-alsa" displaymanager="cosmic-greeter" ;; esac }