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: 'Mode Selection' > 'Manual Mode': Formatting the {ESP,Extended Bootloader,Root} partitions cannot be skipped anymore.

Browse Source 
Formatting /Home partition can be skipped, as it can be re-used in the new system, if desired.
This commit is contained in:
Jane Doe
2025-11-15 12:57:08 +02:00
parent c132d5a9ed
commit 99d027ca21
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+37 -36
View File
@@ -2,7 +2,7 @@
# Amelia Installer # Amelia Installer
# Source: https://gitlab.com/prism7/archery # Source: https://gitlab.com/prism7/archery
# Version: 1.0.3 # Version: 1.0.4
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -4741,9 +4741,9 @@ Enter a name: "
if [[ -z "${ENCROOT}" ]]; then if [[ -z "${ENCROOT}" ]]; then
sleep 0.2 sleep 0.2
RED " RED "
----------------------------------------- -----------------------------
### ${nc}Please enter a name to continue ${red}### ### ${nc}Please enter a name ${red}###
-----------------------------------------" -----------------------------"
reload reload
return 1 return 1
elif [[ -n "${ENCROOT}" ]]; then elif [[ -n "${ENCROOT}" ]]; then
@@ -4793,9 +4793,9 @@ Enter a name: "
if [[ -z "${ENCRHOME}" ]]; then if [[ -z "${ENCRHOME}" ]]; then
sleep 0.2 sleep 0.2
RED " RED "
----------------------------------------- -----------------------------
### ${nc}Please enter a name to continue ${red}### ### ${nc}Please enter a name ${red}###
-----------------------------------------" -----------------------------"
reload reload
return 1 return 1
elif [[ -n "${ENCRHOME}" ]]; then elif [[ -n "${ENCRHOME}" ]]; then
@@ -5248,13 +5248,13 @@ ${volumes}"
BLUE " BLUE "
Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " Enter a partition number: "
read -r -p " read -r -p "
==> " form_esp_nmbr ==> " form_esp_nmbr
if [[ -n "${form_esp_nmbr}" ]]; then if [[ -n "${form_esp_nmbr}" ]]; then
esppart="$(echo "${volumes}" | awk "\$1 == ${form_esp_nmbr} {print \$2}")" esppart="$(echo "${volumes}" | awk "\$1 == ${form_esp_nmbr} {print \$2}")"
manespfs="$(lsblk -dno FSTYPE "${esppart}")" manespfs="$(lsblk -dno FSTYPE "${esppart}" 2> "${void}")"
if [[ -e "${esppart}" ]]; then if [[ -e "${esppart}" ]]; then
if [[ "${multibooting}" == "n" ]]; then if [[ "${multibooting}" == "n" ]]; then
if mkfs.fat -F 32 -n ESP "${esppart}" > "${void}" 2> "${log}" ; then if mkfs.fat -F 32 -n ESP "${esppart}" > "${void}" 2> "${log}" ; then
@@ -5293,13 +5293,10 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
invalid invalid
return 1 return 1
fi fi
else
choice
return 1
fi fi
RED "
---------------------------------------------------
### ${yellow}WARNING: ${nc}PARTITION HAS NOT BEEN FORMATTED ${red}###
---------------------------------------------------"
sleep 2
skip
done done
} }
################################################################################################### ###################################################################################################
@@ -5323,7 +5320,7 @@ ${volumes}"
BLUE " BLUE "
Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " Enter a partition number: "
read -r -p " read -r -p "
==> " form_xboot_nmbr ==> " form_xboot_nmbr
@@ -5346,13 +5343,10 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
invalid invalid
return 1 return 1
fi fi
else
choice
return 1
fi fi
RED "
---------------------------------------------------
### ${yellow}WARNING: ${nc}PARTITION HAS NOT BEEN FORMATTED ${red}###
---------------------------------------------------"
sleep 2
skip
done done
} }
################################################################################################### ###################################################################################################
@@ -5376,7 +5370,7 @@ ${volumes}"
BLUE " BLUE "
Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: " Enter a partition number: "
read -r -p " read -r -p "
==> " form_root_nmbr ==> " form_root_nmbr
@@ -5435,7 +5429,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
BLUE " BLUE "
Enter a name ${bwhite}(empty to skip and proceed)${blue}: " Enter a name: "
read -r -p " read -r -p "
==> " rootpartname ==> " rootpartname
@@ -5461,17 +5455,18 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
==> [${green}Label ${roottype} OK${nc}] " ==> [${green}Label ${roottype} OK${nc}] "
return 0 return 0
fi fi
else
sleep 0.2
RED "
-----------------------------
### ${nc}Please enter a name ${red}###
-----------------------------"
reload
return 1
fi fi
skip
return 0
else else
RED " choice
--------------------------------------------------- return 1
### ${yellow}WARNING: ${nc}PARTITION HAS NOT BEEN FORMATTED ${red}###
---------------------------------------------------"
sleep 2
skip
return 0
fi fi
done done
} }
@@ -5577,7 +5572,7 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
BLUE " BLUE "
Enter a name ${bwhite}(empty to skip and proceed)${blue}: " Enter a name: "
read -r -p " read -r -p "
==> " homepartname ==> " homepartname
@@ -5592,9 +5587,15 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
err_try err_try
return 1 return 1
fi fi
else
sleep 0.2
RED "
-----------------------------
### ${nc}Please enter a name ${red}###
-----------------------------"
reload
return 1
fi fi
skip
return 0
else else
RED " RED "
--------------------------------------------------- ---------------------------------------------------