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

Change: Prompts have been edited for aesthetic reasons

Browse Source
This commit is contained in:
Jane Doe
2025-11-30 20:27:41 +02:00
parent a7bdaca37b
commit 09cdd4fc5c
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+15 -8
View File
@@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# Source: https://gitlab.com/prism7/archery # Source: https://gitlab.com/prism7/archery
# Version: 1.1.2 # Version: 1.1.3
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -2446,6 +2446,10 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
invalid invalid
return 1 ;; return 1 ;;
esac esac
if [[ "${web}" =~ ^(4|5|6|7|8|9)$ && -z "${devel}" ]]; then
validpkgs+=(base-devel)
fi
else else
sleep 0.2 sleep 0.2
RED " RED "
@@ -2468,7 +2472,6 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
keypress keypress
fi fi
[[ "${web}" =~ ^(4|5|6|7|8|9)$ ]] && validpkgs+=("base-devel" "git")
if [[ "${web}" =~ ^(1|2|3|4|5|6|7|8|9)$ ]]; then if [[ "${web}" =~ ^(1|2|3|4|5|6|7|8|9)$ ]]; then
local prompt="${web_name}" local prompt="${web_name}"
web_slct="yes" web_slct="yes"
@@ -5857,8 +5860,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
mount /dev/mapper/root /mnt > "${void}" 2> "${log}" || err_abort mount /dev/mapper/root /mnt > "${void}" 2> "${log}" || err_abort
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}Encrypted /Root OK${nc}] ==> [${green}Encrypted /Root OK${nc}] "
"
luks_root="ok" luks_root="ok"
#------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------
elif [[ "${fs}" == "2" ]]; then elif [[ "${fs}" == "2" ]]; then
@@ -5885,8 +5887,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
fi fi
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}Encrypted /@ OK${nc}] ==> [${green}Encrypted /@ OK${nc}] "
"
luks_root="ok" luks_root="ok"
fi fi
else else
@@ -5907,8 +5908,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
mkswap /dev/mapper/swap > "${void}" 2> "${log}" || err_abort mkswap /dev/mapper/swap > "${void}" 2> "${log}" || err_abort
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}Encrypted /Swap OK${nc}] ==> [${green}Encrypted /Swap OK${nc}] "
"
luks_swap="ok" luks_swap="ok"
else else
line2 line2
@@ -5960,6 +5960,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}/ESP OK${nc}] ==> [${green}/ESP OK${nc}]
" "
else else
@@ -5970,6 +5971,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
if mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" ; then if mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" ; then
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}Unformatted /ESP Mounted OK${nc}] ==> [${green}Unformatted /ESP Mounted OK${nc}]
" "
else else
@@ -5983,6 +5985,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort mount --mkdir "${esp_dev}" "${esp_mount}" > "${void}" 2> "${log}" || err_abort
sleep 0.2 sleep 0.2
NC " NC "
==> [${green}/ESP OK${nc}] ==> [${green}/ESP OK${nc}]
" "
else else
@@ -6209,8 +6212,12 @@ pkg_validation() {
------------------------------------------ ------------------------------------------
### ${bwhite}Validating Installation Packages ${yellowl}### ### ${bwhite}Validating Installation Packages ${yellowl}###
------------------------------------------ ------------------------------------------
" "
validpkgs+=("${deskpkgs}") validpkgs+=("${deskpkgs}")
echo "${validpkgs[*]}"
keypress
valids="${validpkgs[*]}" valids="${validpkgs[*]}"
line2 line2
if pacman -Syy > "${void}" 2>&1 2> "${log}" && pacman -Spd ${valids} > "${void}" 2>&1 2> "${log}"; then if pacman -Syy > "${void}" 2>&1 2> "${log}" && pacman -Spd ${valids} > "${void}" 2>&1 2> "${log}"; then