albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change: The installer is displaying the installation configuration messages in a more concise way.

Browse source
This commit is contained in:
Jane Doe 2024-12-03 16:34:09 +00:00
parent a4496d21ce
commit c58b8aa5d0
1 changed files with 16 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Amelia.sh
View file

@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# https://gitlab.com/prism7/archery # https://gitlab.com/prism7/archery
# Version: 8.0.10 # Version: 8.0.11
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@ -203,9 +203,9 @@ ok() {
stage_ok() { stage_ok() {
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}${stage_prompt} OK${nc}]
==> [${green}${stage_prompt} configuration OK${nc}] " "
sleep 2 sleep 0.3
} }
stage_fail() { stage_fail() {
sleep 0.2 sleep 0.2
@ -5410,7 +5410,6 @@ CONF
btldrcfg() { btldrcfg() {
if [[ "${bootloader}" == "1" ]]; then if [[ "${bootloader}" == "1" ]]; then
cnfg
local stage_prompt="Systemd-boot" local stage_prompt="Systemd-boot"
if [[ "${xbootloader}" == "no" ]]; then if [[ "${xbootloader}" == "no" ]]; then
if arch-chroot /mnt <<-BOOTCTL > /dev/null 2>&1 ; then if arch-chroot /mnt <<-BOOTCTL > /dev/null 2>&1 ; then
@ -5432,7 +5431,6 @@ XBOOTCTL
fi fi
fi fi
elif [[ "${bootloader}" == "2" ]]; then elif [[ "${bootloader}" == "2" ]]; then
cnfg
local stage_prompt="Grub" local stage_prompt="Grub"
if arch-chroot /mnt <<-GRUB > /dev/null 2>&1 ; then if arch-chroot /mnt <<-GRUB > /dev/null 2>&1 ; then
cp /etc/default/grub /etc/default/grub.bak cp /etc/default/grub /etc/default/grub.bak
@ -5457,7 +5455,6 @@ GRUB
stage_fail stage_fail
fi fi
cnfg
local stage_prompt="Grub Installation" local stage_prompt="Grub Installation"
if [[ "${sb_sign}" == "y" ]]; then if [[ "${sb_sign}" == "y" ]]; then
if arch-chroot /mnt <<-SBGRUBINST > /dev/null 2>&1 ; then if arch-chroot /mnt <<-SBGRUBINST > /dev/null 2>&1 ; then
@ -5481,8 +5478,7 @@ GRUBINST
fi fi
if [[ "${fs}" == "2" ]]; then if [[ "${fs}" == "2" ]]; then
cnfg local stage_prompt="Grub-Btrfsd"
stage_prompt="Grub-Btrfsd"
if arch-chroot /mnt <<-GRUB_BTRFSD > /dev/null 2>&1 ; then if arch-chroot /mnt <<-GRUB_BTRFSD > /dev/null 2>&1 ; then
systemctl enable grub-btrfsd || exit systemctl enable grub-btrfsd || exit
GRUB_BTRFSD GRUB_BTRFSD
@ -5493,7 +5489,6 @@ GRUB_BTRFSD
fi fi
if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then
cnfg
local stage_prompt="Grub-Nvidia" local stage_prompt="Grub-Nvidia"
if arch-chroot /mnt <<-NVGRUB > /dev/null 2>&1 ; then if arch-chroot /mnt <<-NVGRUB > /dev/null 2>&1 ; then
sed -i "/^#GRUB_TERMINAL_OUTPUT=console/s/^#//" /etc/default/grub || exit sed -i "/^#GRUB_TERMINAL_OUTPUT=console/s/^#//" /etc/default/grub || exit
@ -5510,7 +5505,6 @@ NVGRUB
trimcfg() { trimcfg() {
if [[ -n "${trim}" ]]; then if [[ -n "${trim}" ]]; then
cnfg
local stage_prompt="Trim Service" local stage_prompt="Trim Service"
if arch-chroot /mnt <<-TRIM > /dev/null 2>&1 ; then if arch-chroot /mnt <<-TRIM > /dev/null 2>&1 ; then
systemctl enable ${trim} || exit systemctl enable ${trim} || exit
@ -5525,7 +5519,6 @@ TRIM
vm_serv() { vm_serv() {
if [[ -n "${vm_services}" ]]; then if [[ -n "${vm_services}" ]]; then
cnfg
local stage_prompt="VM Service(s)" local stage_prompt="VM Service(s)"
if arch-chroot /mnt <<-VM > /dev/null 2>&1 ; then if arch-chroot /mnt <<-VM > /dev/null 2>&1 ; then
systemctl enable ${vm_services} || exit systemctl enable ${vm_services} || exit
@ -5540,7 +5533,6 @@ VM
zramcfg() { zramcfg() {
if [[ -n "${zram}" ]]; then if [[ -n "${zram}" ]]; then
cnfg
local stage_prompt="Zram Swap" local stage_prompt="Zram Swap"
zram_service="systemd-zram-setup@zram0.service" zram_service="systemd-zram-setup@zram0.service"
if arch-chroot /mnt <<-ZRAMCONF > /dev/null 2>&1 ; then if arch-chroot /mnt <<-ZRAMCONF > /dev/null 2>&1 ; then
@ -5570,7 +5562,6 @@ nvidia_hook() {
if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then if [[ "${vgaconf}" == "y" && "${vendor}" == "Nvidia" ]]; then
if [[ "${nvname}" == "nvidia-open" ]] || [[ "${nvname}" == "nvidia" ]] || [[ "${nvname}" == "nvidia-lts" ]]; then if [[ "${nvname}" == "nvidia-open" ]] || [[ "${nvname}" == "nvidia" ]] || [[ "${nvname}" == "nvidia-lts" ]]; then
cnfg
local stage_prompt="Nvidia-Hook" local stage_prompt="Nvidia-Hook"
if arch-chroot /mnt <<-NVIDIAHOOK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-NVIDIAHOOK > /dev/null 2>&1 ; then
mkdir -p /etc/pacman.d/hooks/ || exit mkdir -p /etc/pacman.d/hooks/ || exit
@ -5601,7 +5592,6 @@ NVIDIAHOOK
################################################################################################### ###################################################################################################
mkinitcpio_preset() { mkinitcpio_preset() {
cnfg
local stage_prompt="Mkinitcpio Kernel Presets" local stage_prompt="Mkinitcpio Kernel Presets"
if [[ "${uki}" == "y" ]]; then if [[ "${uki}" == "y" ]]; then
@ -5653,7 +5643,6 @@ NOUKI
secboot_sign() { secboot_sign() {
if [[ ${sb_sign} == "y" ]]; then if [[ ${sb_sign} == "y" ]]; then
cnfg
local stage_prompt="Secure Boot Signing" local stage_prompt="Secure Boot Signing"
if [[ ${bootloader} == "1" ]]; then if [[ ${bootloader} == "1" ]]; then
if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 ; then if arch-chroot /mnt <<-SECSIGN > /dev/null 2>&1 ; then
@ -5862,9 +5851,8 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
main_chroot main_chroot
if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then
cnfg
if [[ "${packages}" == "7" ]]; then if [[ "${packages}" == "7" ]]; then
stage_prompt="Deepin Greeter" local stage_prompt="Deepin Greeter"
if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 ; then if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit
DEEPIN DEEPIN
@ -5873,7 +5861,7 @@ DEEPIN
stage_fail stage_fail
fi fi
elif [[ "${packages}" == "5" || "${packages}" == "8" || "${packages}" == "10" ]]; then elif [[ "${packages}" == "5" || "${packages}" == "8" || "${packages}" == "10" ]]; then
stage_prompt="GTK Greeter" local stage_prompt="GTK Greeter"
if arch-chroot /mnt <<-GTK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-GTK > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit
GTK GTK
@ -5882,7 +5870,7 @@ GTK
stage_fail stage_fail
fi fi
elif [[ "${packages}" == "6" ]]; then elif [[ "${packages}" == "6" ]]; then
stage_prompt="Slick Greeter" local stage_prompt="Slick Greeter"
if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit
SLICK SLICK
@ -5894,8 +5882,7 @@ SLICK
fi fi
if [[ -n "${bluetooth}" ]]; then if [[ -n "${bluetooth}" ]]; then
cnfg local stage_prompt="Bluetooth Service"
stage_prompt="Bluetooth Service"
if arch-chroot /mnt <<-BLUETOOTH > /dev/null 2>&1 ; then if arch-chroot /mnt <<-BLUETOOTH > /dev/null 2>&1 ; then
systemctl enable ${bluetooth} || exit systemctl enable ${bluetooth} || exit
BLUETOOTH BLUETOOTH
@ -5906,8 +5893,7 @@ BLUETOOTH
fi fi
if [[ -n "${displaymanager}" ]]; then if [[ -n "${displaymanager}" ]]; then
cnfg local stage_prompt="Display Manager Service"
stage_prompt="Display Manager Service"
if arch-chroot /mnt <<-DMSERVICE > /dev/null 2>&1 ; then if arch-chroot /mnt <<-DMSERVICE > /dev/null 2>&1 ; then
systemctl enable ${displaymanager} || exit systemctl enable ${displaymanager} || exit
DMSERVICE DMSERVICE
@ -5918,8 +5904,7 @@ DMSERVICE
fi fi
if [[ -n "${network}" ]]; then if [[ -n "${network}" ]]; then
cnfg local stage_prompt="Network Manager Service"
stage_prompt="Network Manager Service"
if arch-chroot /mnt <<-NETWORK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-NETWORK > /dev/null 2>&1 ; then
systemctl enable ${network} || exit systemctl enable ${network} || exit
NETWORK NETWORK
@ -5945,9 +5930,8 @@ NETWORK
main_chroot main_chroot
if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then if [[ -f /mnt/etc/lightdm/lightdm.conf ]]; then
cnfg
if [[ "${greeternmbr}" == "1" ]]; then if [[ "${greeternmbr}" == "1" ]]; then
stage_prompt="GTK Greeter" local stage_prompt="GTK Greeter"
if arch-chroot /mnt <<-GTK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-GTK > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-gtk-greeter|g' /etc/lightdm/lightdm.conf || exit
GTK GTK
@ -5956,7 +5940,7 @@ GTK
stage_fail stage_fail
fi fi
elif [[ "${greeternmbr}" == "2" ]]; then elif [[ "${greeternmbr}" == "2" ]]; then
stage_prompt="Slick Greeter" local stage_prompt="Slick Greeter"
if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 ; then if arch-chroot /mnt <<-SLICK > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-slick-greeter|g' /etc/lightdm/lightdm.conf || exit
SLICK SLICK
@ -5965,7 +5949,7 @@ SLICK
stage_fail stage_fail
fi fi
elif [[ "${greeternmbr}" == "3" ]]; then elif [[ "${greeternmbr}" == "3" ]]; then
stage_prompt="Deepin Greeter" local stage_prompt="Deepin Greeter"
if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 ; then if arch-chroot /mnt <<-DEEPIN > /dev/null 2>&1 ; then
sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit sed -i 's|^#greeter-session=example-gtk-gnome|greeter-session=lightdm-deepin-greeter|g' /etc/lightdm/lightdm.conf || exit
DEEPIN DEEPIN
@ -5977,8 +5961,7 @@ DEEPIN
fi fi
if [[ -n "${customservices}" ]]; then if [[ -n "${customservices}" ]]; then
cnfg local stage_prompt="Custom Service(s)"
stage_prompt="Custom Service(s)"
if arch-chroot /mnt <<-CUSTOMSERV > /dev/null 2>&1 ; then if arch-chroot /mnt <<-CUSTOMSERV > /dev/null 2>&1 ; then
systemctl enable ${customservices} || exit systemctl enable ${customservices} || exit
CUSTOMSERV CUSTOMSERV
@ -6000,7 +5983,7 @@ CUSTOMSERV
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
# Minimal Plasma/Gnome Optimized System Configuration: # Minimal Plasma/Gnome Optimized System Configuration:
if [[ "${packages}" == "2" || "${packages}" == "4" ]]; then if [[ "${packages}" == "2" || "${packages}" == "4" ]]; then
stage_prompt="Optimized System" local stage_prompt="Optimized System"
cnfg cnfg
if [[ "${packages}" == "2" ]]; then if [[ "${packages}" == "2" ]]; then