mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 01:17:35 +02:00
"System Configuration" > "Desktop Setup" > "Printer & Scanner Support" : Now this stage strictly defines which packages will be installed on a "Minimal Plasma" or "Minimal Gnome" desktop (if selected) ommiting said packages from the "Desktop Selection" stage, to keep the installation more minimalistic.
A few 'if' statements have been redefined A few packages have been removed, as they no longer exist in the Arch repos or are direct dependencies of other existing packages A few prompts have been edited for aesthetic reasons The installer has been updated accordingly and verified to be working with the current Arch Linux version (August 2025)
This commit is contained in:
Jane Doe
@@ -2,7 +2,7 @@
|
||||
|
||||
# Amelia Installer
|
||||
# Source: https://gitlab.com/prism7/archery
|
||||
# Version: 9.0.1
|
||||
# Version: 9.0.2
|
||||
|
||||
set -euo pipefail
|
||||
###################################################################################################
|
||||
@@ -2280,7 +2280,9 @@ Enter [Y/n]: "
|
||||
###################################################################################################
|
||||
web_browser() {
|
||||
|
||||
if [[ "${packages}" =~ ^(11|12)$ && -n "${revision}" ]]; then
|
||||
if [[ "${packages}" =~ ^(11|12)$ ]] && [[ -n "${revision}" ]]; then
|
||||
web_browser=""
|
||||
web_slct=""
|
||||
return 0
|
||||
fi
|
||||
sleep 0.2
|
||||
@@ -2290,7 +2292,7 @@ web_browser() {
|
||||
${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Web browser Selection${nc} ${magenta}]${nc}----------------------------------${magenta}###
|
||||
"
|
||||
local prompt="Web Browser"
|
||||
if [[ ! "${packages}" =~ ^(11|12|)$ ]]; then
|
||||
if [[ "${packages}" =~ ^(1|2|3|4|5|6|7|8|9|10|13)$ ]]; then
|
||||
sleep 0.2
|
||||
YELLOW "
|
||||
|
||||
@@ -2363,7 +2365,7 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
|
||||
sleep 0.2
|
||||
YELLOW "
|
||||
|
||||
### Basic Arch Linux, Custom Arch Linux or No Desktop has been detected
|
||||
### Basic Arch Linux / Custom Arch Linux detected or No Desktop selected yet
|
||||
|
||||
### No Browser selected
|
||||
"
|
||||
@@ -2391,7 +2393,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Printer &
|
||||
"
|
||||
local prompt="Printer & Scanner Support"
|
||||
if [[ "${hypervisor}" == "none" ]]; then
|
||||
if [[ ! "${packages}" =~ ^(11|12)$ ]]; then
|
||||
if [[ "${packages}" =~ ^(1|2|3|4|5|6|7|8|9|10|13)$ ]]; then
|
||||
sleep 0.2
|
||||
YELLOW "
|
||||
|
||||
@@ -2413,9 +2415,16 @@ Enter [Y/n]: "
|
||||
|
||||
case "${printer}" in
|
||||
y)
|
||||
print_pkgs="cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan system-config-printer xdg-utils colord"
|
||||
if [[ "${packages}" == "2" ]]; then
|
||||
print_pkgs="cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan print-manager skanlite system-config-printer xdg-utils colord"
|
||||
elif [[ "${packages}" == "4" ]]; then
|
||||
print_pkgs="cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan simple-scan system-config-printer xdg-utils colord"
|
||||
else
|
||||
print_pkgs="cups-pdf cups-browsed cups-pk-helper ipp-usb nss-mdns sane-airscan system-config-printer xdg-utils colord"
|
||||
fi
|
||||
ok ;;
|
||||
n)
|
||||
print_pkgs=""
|
||||
skip ;;
|
||||
*)
|
||||
invalid
|
||||
@@ -2430,10 +2439,11 @@ Enter [Y/n]: "
|
||||
sleep 0.2
|
||||
YELLOW "
|
||||
|
||||
### Basic Arch Linux, Custom Arch Linux or No Desktop has been detected
|
||||
### Basic Arch Linux / Custom Arch Linux detected or No Desktop selected yet
|
||||
|
||||
### No Support enabled
|
||||
### Printer/Scanner support not enabled
|
||||
"
|
||||
print_pkgs=""
|
||||
skip
|
||||
NC "
|
||||
|
||||
@@ -2446,6 +2456,7 @@ Enter [Y/n]: "
|
||||
fi
|
||||
else
|
||||
vm
|
||||
print_pkgs=""
|
||||
skip
|
||||
fi
|
||||
}
|
||||
@@ -6054,7 +6065,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
||||
shell="bash" ;;
|
||||
|
||||
2) # Minimal Plasma + Apps:
|
||||
deskpkgs="${basepkgs[*]} alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache dolphin-plugins exfatprogs fdkaac ffmpegthumbs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils kamera kamoso kate kcalc kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdesdk-kio kdesdk-thumbnailers kdialog keditbookmarks kget kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils nano-syntax-highlighting okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml qt6-virtualkeyboard reflector sddm-kcm skanlite sox spectacle sshfs terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}"
|
||||
deskpkgs="${basepkgs[*]} alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache dolphin-plugins exfatprogs fdkaac ffmpegthumbs git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi icoutils kamera kamoso kate kcalc kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdesdk-kio kdesdk-thumbnailers kdialog keditbookmarks kget kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils nano-syntax-highlighting okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerline powerline-fonts python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml reflector sddm-kcm sox spectacle sshfs terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools wget xdg-desktop-portal xdg-desktop-portal-gtk zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}"
|
||||
displaymanager="sddm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
@@ -6068,7 +6079,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
||||
shell="bash" ;;
|
||||
|
||||
4) # Minimal Gnome + Apps:
|
||||
deskpkgs="${basepkgs[*]} dconf-editor evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe nautilus power-profiles-daemon simple-scan sushi xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils nano-syntax-highlighting p7zip pacman-contrib powerline powerline-fonts qbittorrent reflector sox terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}"
|
||||
deskpkgs="${basepkgs[*]} dconf-editor evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe nautilus power-profiles-daemon sushi xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi icoutils libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils nano-syntax-highlighting p7zip pacman-contrib powerline powerline-fonts qbittorrent reflector sox terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}"
|
||||
displaymanager="gdm"
|
||||
bluetooth="bluetooth"
|
||||
network="NetworkManager"
|
||||
@@ -6094,7 +6105,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
||||
shell="bash" ;;
|
||||
|
||||
8) # Budgie Desktop:
|
||||
deskpkgs="${basepkgs[*]} budgie lightdm-gtk-greeter arc-gtk-theme papirus-icon-theme nautilus network-manager-applet xdg-desktop-portal ${terminal}"
|
||||
deskpkgs="${basepkgs[*]} budgie lightdm-gtk-greeter papirus-icon-theme nautilus network-manager-applet xdg-desktop-portal ${terminal}"
|
||||
displaymanager="lightdm"
|
||||
network="NetworkManager"
|
||||
shell="bash" ;;
|
||||
@@ -6137,7 +6148,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
|
||||
if [[ -n "${gfxpkgs[*]}" ]]; then
|
||||
custarray+=("${gfxpkgs[*]}")
|
||||
fi
|
||||
if [[ "${greeternmbr}" =~ ^(1|2|3|)$ ]]; then
|
||||
if [[ "${greeternmbr}" =~ ^(1|2|3)$ ]]; then
|
||||
custarray+=("${greeter}")
|
||||
fi
|
||||
if [[ -n "${wireless_reg}" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user