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

Code indentation

Browse source
This commit is contained in:
Jane Doe 2025-01-12 18:43:09 +00:00
parent d734e4ab90
commit cda418d4a7
1 changed files with 67 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

137
Amelia.sh
View file

@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# https://gitlab.com/prism7/archery # https://gitlab.com/prism7/archery
# Version: 8.4.2 # Version: 8.4.3
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@ -1435,14 +1435,14 @@ dtct_vga() {
${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Graphics Setup${nc} ${magenta}]${nc}-------------------------------------${magenta}### ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Graphics Setup${nc} ${magenta}]${nc}-------------------------------------${magenta}###
" "
vgacount="$(lspci | grep -E -c 'VGA|Display|3D')" vgacount="$(lspci | grep -E -c 'VGA|Display|3D')"
vgacard="$(lspci | grep -E 'VGA|Display|3D' | sed 's/^.*: //g')" vgacard="$(lspci | grep -E 'VGA|Display|3D' | sed 's/^.*: //g')"
intelcount="$(lspci | grep -E 'VGA|Display|3D' | grep -E -c 'Intel Corporation')" intelcount="$(lspci | grep -E 'VGA|Display|3D' | grep -E -c 'Intel Corporation')"
intelcards="$(lspci | grep -E 'VGA|Display|3D' | grep -E 'Intel Corporation'| sed 's/.*Corporation //g' | cat --number | sed 's/.[0-9]//')" intelcards="$(lspci | grep -E 'VGA|Display|3D' | grep -E 'Intel Corporation'| sed 's/.*Corporation //g' | cat --number | sed 's/.[0-9]//')"
amdcount="$(lspci | grep -E 'VGA|Display|3D' | grep -E -c 'Advanced Micro Devices')" amdcount="$(lspci | grep -E 'VGA|Display|3D' | grep -E -c 'Advanced Micro Devices')"
amdcards="$(lspci | grep -E 'VGA|Display|3D' | grep -E 'Advanced Micro Devices' | sed 's/.*\[AMD\/ATI\] //g' | cat --number | sed 's/.[0-9]//')" amdcards="$(lspci | grep -E 'VGA|Display|3D' | grep -E 'Advanced Micro Devices' | sed 's/.*\[AMD\/ATI\] //g' | cat --number | sed 's/.[0-9]//')"
nvidiacount="$(lspci | grep -E 'VGA|Display|3D' | grep -E -c 'NVIDIA Corporation')" nvidiacount="$(lspci | grep -E 'VGA|Display|3D' | grep -E -c 'NVIDIA Corporation')"
nvidiacards="$(lspci | grep -E 'VGA|Display|3D' | grep -E 'NVIDIA Corporation'| sed 's/.*Corporation //g' | cat --number | sed 's/.[0-9]//')" nvidiacards="$(lspci | grep -E 'VGA|Display|3D' | grep -E 'NVIDIA Corporation'| sed 's/.*Corporation //g' | cat --number | sed 's/.[0-9]//')"
if [[ "${vgacount}" == "1" ]]; then if [[ "${vgacount}" == "1" ]]; then
dtct_single_vga dtct_single_vga
@ -1453,8 +1453,6 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Grap
################################################################################################### ###################################################################################################
dtct_single_vga() { dtct_single_vga() {
local prompt="Graphics Setup"
if [[ "${intelcount}" -eq "1" ]]; then if [[ "${intelcount}" -eq "1" ]]; then
vendor="Intel" vendor="Intel"
sourcetype="Open-source" sourcetype="Open-source"
@ -1510,8 +1508,6 @@ Enter [Y/n]: "
################################################################################################### ###################################################################################################
dtct_multi_vga() { dtct_multi_vga() {
local prompt="Graphics Setup"
if [[ "${vgacount}" == "2" ]]; then if [[ "${vgacount}" == "2" ]]; then
vga_setup="Dual" vga_setup="Dual"
elif [[ "${vgacount}" == "3" ]]; then elif [[ "${vgacount}" == "3" ]]; then
@ -1661,6 +1657,7 @@ Enter a number: "
sourcetype="Proprietary" sourcetype="Proprietary"
vgaconf="y" vgaconf="y"
elif [[ "${vendor}" == "none" ]]; then elif [[ "${vendor}" == "none" ]]; then
local prompt="Graphics Setup"
vgaconf="n" vgaconf="n"
skip skip
ok ok
@ -2603,6 +2600,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
" "
read -r -s -n 1 read -r -s -n 1
if [[ -e "${instl_drive}" && "${use_manpreset}" != "yes" ]]; then if [[ -e "${instl_drive}" && "${use_manpreset}" != "yes" ]]; then
sleep 0.2 sleep 0.2
NC " NC "
@ -2889,15 +2887,15 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
if [[ -n "${cgdsk_nmbr}" ]]; then if [[ -n "${cgdsk_nmbr}" ]]; then
cgdrive="$(echo "${disks}" | awk "\$1 == ${cgdsk_nmbr} {print \$2}")" cgdrive="$(echo "${disks}" | awk "\$1 == ${cgdsk_nmbr} {print \$2}")"
if [[ -e "${cgdrive}" ]]; then if [[ -e "${cgdrive}" ]]; then
if [[ "${run_as}" != "root" ]]; then if [[ "${run_as}" != "root" ]]; then
sleep 0.2 sleep 0.2
RED " RED "
----------------------------------- -----------------------------------
### ${yellow}Root Privileges Missing.. ${red}### ### ${yellow}Root Privileges Missing.. ${red}###
-----------------------------------" -----------------------------------"
reload reload
until dsks_submn; do : ; done until dsks_submn; do : ; done
fi fi
cgdisk "${cgdrive}" cgdisk "${cgdrive}"
clear clear
sleep 0.2 sleep 0.2
@ -3531,9 +3529,9 @@ ${multi_swap}
fi fi
#.................................................................................................. #..................................................................................................
if [[ ${rootprt} == "fail" ]] || [[ "${espprt}" == "fail" ]] || [[ "${xbootprt}" == "fail" ]] || [[ ${homeprt} == "fail" ]] || [[ ${swapprt} == "fail" ]]; then if [[ ${rootprt} == "fail" ]] || [[ "${espprt}" == "fail" ]] || [[ "${xbootprt}" == "fail" ]] || [[ ${homeprt} == "fail" ]] || [[ ${swapprt} == "fail" ]]; then
sanity="no" sanity="no"
else else
sanity="ok" sanity="ok"
fi fi
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
if [[ "${sanity}" == "ok" ]]; then if [[ "${sanity}" == "ok" ]]; then
@ -3818,30 +3816,30 @@ Enter a name: "
Enter a name: " Enter a name: "
read -r -p " read -r -p "
==> " ENCRHOME ==> " ENCRHOME
echo
if [[ -z "${ENCRHOME}" ]]; then echo
sleep 0.2 if [[ -z "${ENCRHOME}" ]]; then
RED " sleep 0.2
RED "
----------------------------------------- -----------------------------------------
### ${yellow}Please enter a name to continue ${red}### ### ${yellow}Please enter a name to continue ${red}###
-----------------------------------------" -----------------------------------------"
reload reload
return 1 return 1
elif [[ "${ENCRHOME}" =~ [[:upper:]] ]]; then elif [[ "${ENCRHOME}" =~ [[:upper:]] ]]; then
sleep 0.2 sleep 0.2
RED " RED "
------------------------------------------------------ ------------------------------------------------------
### ${yellow}Uppercase is not allowed. Please try again.. ${red}### ### ${yellow}Uppercase is not allowed. Please try again.. ${red}###
------------------------------------------------------" ------------------------------------------------------"
reload reload
return 1 return 1
elif [[ -n "${ENCRHOME}" ]]; then elif [[ -n "${ENCRHOME}" ]]; then
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}Encrypted /Home Label OK${nc}] " ==> [${green}Encrypted /Home Label OK${nc}] "
fi fi
else else
yes_no yes_no
return 1 return 1
@ -4054,6 +4052,7 @@ Enter a Mode number: "
################################################################################################### ###################################################################################################
auto_mode() { auto_mode() {
espfs="$(lsblk -dno FSTYPE "${esp_dev}")"
sleep 0.2 sleep 0.2
NC " NC "
${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}Auto Mode${nc} ${magenta}]${nc}----------------------------------------${magenta}### ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}Auto Mode${nc} ${magenta}]${nc}----------------------------------------${magenta}###
@ -4064,9 +4063,6 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
> Auto Mode Selected > Auto Mode Selected
" "
sleep 0.2
espfs="$(lsblk -dno FSTYPE "${esp_dev}")"
if [[ "${fs}" == "1" ]]; then if [[ "${fs}" == "1" ]]; then
if mkfs.ext4 -F -L Root "${root_dev}" > /dev/null 2> amelia_log.txt ; then if mkfs.ext4 -F -L Root "${root_dev}" > /dev/null 2> amelia_log.txt ; then
tune2fs -O fast_commit "${root_dev}" > /dev/null 2> amelia_log.txt || err_abort tune2fs -O fast_commit "${root_dev}" > /dev/null 2> amelia_log.txt || err_abort
@ -4090,14 +4086,14 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
btrfs subvolume create /mnt/@log > /dev/null 2> amelia_log.txt || err_abort btrfs subvolume create /mnt/@log > /dev/null 2> amelia_log.txt || err_abort
btrfs subvolume create /mnt/@tmp > /dev/null 2> amelia_log.txt || err_abort btrfs subvolume create /mnt/@tmp > /dev/null 2> amelia_log.txt || err_abort
btrfs subvolume create /mnt/@snapshots > /dev/null 2> amelia_log.txt || err_abort btrfs subvolume create /mnt/@snapshots > /dev/null 2> amelia_log.txt || err_abort
if [[ "${swapmode}" == "2" ]]; then if [[ "${swapmode}" == "2" ]]; then
btrfs subvolume create /mnt/@swap > /dev/null 2> amelia_log.txt || err_abort btrfs subvolume create /mnt/@swap > /dev/null 2> amelia_log.txt || err_abort
fi fi
umount /mnt > /dev/null 2> amelia_log.txt || err_abort umount /mnt > /dev/null 2> amelia_log.txt || err_abort
mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > /dev/null 2> amelia_log.txt || err_abort mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt > /dev/null 2> amelia_log.txt || err_abort
if [[ "${swapmode}" == "2" ]]; then if [[ "${swapmode}" == "2" ]]; then
mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > /dev/null 2> amelia_log.txt || err_abort mount --mkdir -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap > /dev/null 2> amelia_log.txt || err_abort
fi fi
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > /dev/null 2> amelia_log.txt || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache > /dev/null 2> amelia_log.txt || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home > /dev/null 2> amelia_log.txt || err_abort
mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > /dev/null 2> amelia_log.txt || err_abort mount --mkdir -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log > /dev/null 2> amelia_log.txt || err_abort
@ -4206,9 +4202,9 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
until form_home; do : ; done until form_home; do : ; done
until mount_mnt; do : ; done until mount_mnt; do : ; done
until mount_esp; do : ; done until mount_esp; do : ; done
if [[ "${xbootloader}" == "yes" ]]; then if [[ "${xbootloader}" == "yes" ]]; then
until mount_xboot; do : ; done until mount_xboot; do : ; done
fi fi
until mount_home; do : ; done until mount_home; do : ; done
fi fi
elif [[ "${homeform}" == "n" ]]; then elif [[ "${homeform}" == "n" ]]; then
@ -4223,22 +4219,23 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
manual_mode() { manual_mode() {
volumes="$(fdisk -l | grep '^/dev' | cat --number)" volumes="$(fdisk -l | grep '^/dev' | cat --number)"
until form_esp; do : ; done until form_esp; do : ; done
if [[ "${xbootloader}" == "yes" ]]; then if [[ "${xbootloader}" == "yes" ]]; then
until form_xboot; do : ; done until form_xboot; do : ; done
fi fi
until form_root; do : ; done until form_root; do : ; done
if [[ -e "${home_dev}" && "${sep_home}" == "y" ]]; then if [[ -e "${home_dev}" && "${sep_home}" == "y" ]]; then
until form_home; do : ; done until form_home; do : ; done
fi fi
until mount_mnt; do : ; done until mount_mnt; do : ; done
until mount_esp; do : ; done until mount_esp; do : ; done
if [[ "${xbootloader}" == "yes" ]]; then if [[ "${xbootloader}" == "yes" ]]; then
until mount_xboot; do : ; done until mount_xboot; do : ; done
fi fi
if [[ -e "${home_dev}" && "${sep_home}" == "y" ]]; then if [[ -e "${home_dev}" && "${sep_home}" == "y" ]]; then
until mount_home; do : ; done until mount_home; do : ; done
fi fi
} }
################################################################################################### ###################################################################################################
form_esp() { form_esp() {
@ -4525,9 +4522,9 @@ ask_homepart_form() {
until form_home; do : ; done until form_home; do : ; done
until mount_mnt; do : ; done until mount_mnt; do : ; done
until mount_esp; do : ; done until mount_esp; do : ; done
if [[ "${xbootloader}" == "yes" ]]; then if [[ "${xbootloader}" == "yes" ]]; then
until mount_xboot; do : ; done until mount_xboot; do : ; done
fi fi
until mount_home; do : ; done until mount_home; do : ; done
fi fi
elif [[ "${homeform}" == "n" ]]; then elif [[ "${homeform}" == "n" ]]; then
@ -5225,7 +5222,6 @@ Enter country name or country code ${bwhite}(Empty for Defaults)${blue}: "
return 1 return 1
fi fi
fi fi
YELLOW " YELLOW "
@ -5283,7 +5279,6 @@ Enter a number: "
y_n y_n
return 1 return 1
fi fi
YELLOW " YELLOW "
@ -5809,6 +5804,7 @@ UKI
if [[ -e /mnt/boot/initramfs-"${kernel}"-fallback.img ]]; then if [[ -e /mnt/boot/initramfs-"${kernel}"-fallback.img ]]; then
rm /mnt/boot/initramfs-"${kernel}"-fallback.img || exit rm /mnt/boot/initramfs-"${kernel}"-fallback.img || exit
fi fi
elif [[ "${uki}" == "n" ]]; then elif [[ "${uki}" == "n" ]]; then
if arch-chroot /mnt <<-NOUKI > /dev/null 2>&1 2> amelia_log.txt ; then if arch-chroot /mnt <<-NOUKI > /dev/null 2>&1 2> amelia_log.txt ; then
cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak || exit cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak || exit
@ -5867,7 +5863,7 @@ SECSIGN
################################################################################################### ###################################################################################################
set_vars() { set_vars() {
#### Encrypted Setup Vars #### Encrypted-Setup Variables
if [[ "${encrypt}" == "yes" ]]; then if [[ "${encrypt}" == "yes" ]]; then
# Encrypted Root Device # Encrypted Root Device
encr_root_dev="/dev/mapper/${ENCROOT}" encr_root_dev="/dev/mapper/${ENCROOT}"
@ -5918,6 +5914,7 @@ set_vars() {
# Graphics Kernel Parameters # Graphics Kernel Parameters
vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1) vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1)
# Disable GSP Firmware
if [[ "${nogsp}" == "y" ]]; then if [[ "${nogsp}" == "y" ]]; then
vga_bootopts+=(nvidia.NVreg_EnableGpuFirmware=0) vga_bootopts+=(nvidia.NVreg_EnableGpuFirmware=0)
fi fi
@ -5971,7 +5968,7 @@ set_vars() {
fi fi
#------------------------------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------------------------------
#### Unencrypted Setup Vars #### Unencrypted-Setup Variables
elif [[ "${encrypt}" == "no" ]]; then elif [[ "${encrypt}" == "no" ]]; then
### Swap Setup ### Swap Setup
## Zram Swap ## Zram Swap
@ -5997,6 +5994,7 @@ set_vars() {
# Graphics Kernel Parameters # Graphics Kernel Parameters
vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1) vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1)
# Disable GSP Firmware
if [[ "${nogsp}" == "y" ]]; then if [[ "${nogsp}" == "y" ]]; then
vga_bootopts+=(nvidia.NVreg_EnableGpuFirmware=0) vga_bootopts+=(nvidia.NVreg_EnableGpuFirmware=0)
fi fi
@ -6058,7 +6056,7 @@ chroot_conf() {
${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot & Configure System${nc} ${magenta}]${nc}--------------------------------${magenta}###${nc} ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot & Configure System${nc} ${magenta}]${nc}--------------------------------${magenta}###${nc}
" "
# 'Vanilla' Configuration: # 'Vanilla' Setups Configuration:
if [[ "${packages}" =~ ^(1|3|5|6|7|8|9|10|11|13)$ ]]; then if [[ "${packages}" =~ ^(1|3|5|6|7|8|9|10|11|13)$ ]]; then
cnfg cnfg
main_chroot main_chroot
@ -6194,7 +6192,7 @@ CUSTOMSERV
completion completion
fi fi
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
# Minimal Plasma/Gnome Optimized System Configuration: # Minimal Plasma/Gnome Optimized-System Configuration:
if [[ "${packages}" == "2" || "${packages}" == "4" ]]; then if [[ "${packages}" == "2" || "${packages}" == "4" ]]; then
local stage_prompt="Optimized System Configuration" local stage_prompt="Optimized System Configuration"
cnfg cnfg
@ -6381,7 +6379,6 @@ MULTILIB
secboot_sign secboot_sign
completion completion
fi fi
umount -R /mnt umount -R /mnt
reboot reboot
exit exit