x/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2026-04-28 01:17:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change: The 'revise' stage has been moved.

Browse Source 
If no encryption has been selected: The stage now takes place after packages validation, so if any validation issues arise or a different setup is desired there will always be alternatives offered.
This commit is contained in:
Jane Doe
2025-11-30 17:01:11 +02:00
parent e57161c8ad
commit a7bdaca37b
1 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+54 -45
View File
@@ -2,7 +2,7 @@
# Amelia Installer
# Source: https://gitlab.com/prism7/archery
# Version: 1.1.1
# Version: 1.1.2
set -euo pipefail
###################################################################################################
@@ -356,6 +356,7 @@ cnfg() {
completion() {
sleep 0.2
line3
line2
GREENBG "************************************************************************************************* "
GREENBG " "
GREENBG " ### Installation Completed ### "
@@ -4891,7 +4892,6 @@ instl() {
if [[ "${encrypt}" == "no" ]]; then
until set_mode; do : ; done
until confirm_status; do : ; done
elif [[ "${encrypt}" == "yes" ]]; then
until sec_erase; do : ; done
until luks; do : ; done
@@ -5163,6 +5163,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
"
fi
fi
keypress
}
###################################################################################################
manual_mode() {
@@ -5747,6 +5748,7 @@ ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Confirm In
if [[ "${agree}" == "yes" ]]; then
ok
line3
return 0
elif [[ "${agree}" == "no" ]]; then
unmount
@@ -5760,9 +5762,10 @@ ${magenta}###${nc}-------------------------------${magenta}[ ${bwhite}Confirm In
revise() {
revision="y"
gfxpkgs=()
validpkgs=()
reset=(xbootloader="" desktop="" terminal="" custompkgs="" customservices="" cust_bootopts="" REGDOM="" autoroot="" autoxboot="" autohome="" autoswap="" lowlat="" nogsp="" sanity="" partok="" preset="" set_optm="" ask_param="" kill_watchdog="" genoptm="" desk_setup="" devel="" web="" web_pkg="" web_aur="" web_slct="" oomd="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" hometype="" homeform="" smartpart="" LuksParts="")
export "${reset[@]}"
gfxpkgs=()
instl
}
@@ -6012,6 +6015,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
==> [${green}Filesystems OK${nc}]
"
keypress
sleep 0.2
CYAN "
###${nc}---------------------------------------------${cyan}[ ${bwhite}FILESYSTEM OVERVIEW ${nc}${cyan}]${nc}---------------------------------------------${cyan}###
@@ -6101,48 +6105,8 @@ Enter [y/N]: "
ok
}
###################################################################################################
pkg_validation() {
pkg_collection() {
local prompt="Arch Packages Validation"
local stage_prompt="Arch Packages Validation"
sleep 0.2
YELLOWL "
------------------------------------------
### ${bwhite}Validating Installation Packages ${yellowl}###
------------------------------------------
"
validpkgs+=("${deskpkgs}")
echo "${validpkgs[*]} ${web_aur}"
valids="${validpkgs[*]}"
line2
if pacman -Syy > "${void}" 2>&1 2> "${log}" && pacman -Spd ${valids} > "${void}" 2>&1 2> "${log}"; then
ok
if [[ -n "${web_aur}" ]]; then
local prompt="AUR Package Validation"
local stage_prompt="AUR Package Validation"
if pacman -S git --noconfirm > "${void}" 2>&1 2> "${log}" && git clone --branch "${web_aur}" --single-branch https://github.com/archlinux/aur.git "${web_aur}" > "${void}" 2>&1 2> "${log}" && rm -R "${web_aur}"; then
ok
else
stage_fail
fi
fi
else
stage_fail
fi
keypress
}
###################################################################################################
pacstrap_system() {
sleep 0.2
NC "
${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacstrap System${nc} ${magenta}]${nc}-------------------------------------${magenta}###
"
installing
gfxpkgs_set
if [[ "${bootloader}" == "2" ]]; then
@@ -6234,9 +6198,54 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
deskpkgs="${basepkgs[*]} cosmic cosmic-player dconf gnome-keyring gvfs gvfs-dnssd gvfs-nfs gvfs-smb packagekit power-profiles-daemon pulseaudio-alsa"
displaymanager="cosmic-greeter" ;;
esac
}
###################################################################################################
pkg_validation() {
local prompt="Arch Packages Validation"
local stage_prompt="Arch Packages Validation"
sleep 0.2
YELLOWL "
------------------------------------------
### ${bwhite}Validating Installation Packages ${yellowl}###
------------------------------------------
"
validpkgs+=("${deskpkgs}")
valids="${validpkgs[*]}"
line2
if pacman -Syy > "${void}" 2>&1 2> "${log}" && pacman -Spd ${valids} > "${void}" 2>&1 2> "${log}"; then
ok
if [[ -n "${web_aur}" ]]; then
local prompt="AUR Package Validation"
local stage_prompt="AUR Package Validation"
if pacman -S git --noconfirm > "${void}" 2>&1 2> "${log}" && git clone --branch "${web_aur}" --single-branch https://github.com/archlinux/aur.git "${web_aur}" > "${void}" 2>&1 2> "${log}" && rm -R "${web_aur}"; then
ok
else
stage_fail
fi
fi
else
stage_fail
fi
if [[ "${encrypt}" == "no" ]]; then
until confirm_status; do : ; done
elif [[ "${encrypt}" == "yes" ]]; then
keypress
fi
}
###################################################################################################
pacstrap_system() {
sleep 0.2
NC "
${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacstrap System${nc} ${magenta}]${nc}-------------------------------------${magenta}###
"
installing
pkg_collection
pkg_validation
if pacstrap -K /mnt ${deskpkgs} 2> "${log}" ; then
local prompt="Pacstrap System"
local stage_prompt="Pacstrap System"