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

Change: 'Auto-Mode' & 'LUKS Encryption' stages > Choosing not to format a detected/existing '/Home' partition no longer results in excluding said partition from being used in the setup.

Browse Source 
Change: Prompts edited for better aesthetics
This commit is contained in:
Jane Doe
2025-11-15 15:44:21 +02:00
parent 99d027ca21
commit af8c881c78
1 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+36 -16
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.4 # Version: 1.0.5
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -3408,10 +3408,10 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Multi
> Are you Dual/Multi-Booting with other OS's ? [y/n] " > Are you Dual/Multi-Booting with other OS's ? [y/n] "
CYAN " YELLOW "
### ${nc}If ${yellowl}'(y)es'${nc} then:${cyan} ### ${nc}If ${bwhite}[y]es${nc} then:${cyan}
>> ${nc}Your ${yellowl}EFI ${nc}System Partition (ESP) will stay ${yellowl}intact${nc}${cyan} >> ${nc}Your ${yellowl}EFI ${nc}System Partition (ESP) will stay ${yellowl}intact${nc}${cyan}
@@ -4078,7 +4078,7 @@ ${multi_esp}
" "
elif [[ "${multibooting}" == "y" ]]; then elif [[ "${multibooting}" == "y" ]]; then
YELLOW " YELLOW "
### Partition ${nc}${esp_comply} ${yellow}is auto-assigned as such ### Partition ${nc}${esp_comply} ${yellow}is auto-assigned as such and will be used
" "
fi fi
BLUE " BLUE "
@@ -4179,7 +4179,7 @@ ${multi_home}
### Only the 1st Linux /Home partition on a selected disk can be auto-assigned as a valid /Home partition ### Only the 1st Linux /Home partition on a selected disk can be auto-assigned as a valid /Home partition
### Partition ${nc}${home_comply} ${yellow}is auto-assigned as such and will be ${red}[!] ${nc}FORMATTED ${red}[!] ### Partition ${nc}${home_comply} ${yellow}is auto-assigned as such and will be used
" "
BLUE " BLUE "
@@ -5118,7 +5118,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
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 OK${nc}] ==> [${green}Unformatted /ESP Mounted OK${nc}]
" "
else else
umount_manual umount_manual
@@ -5164,10 +5164,13 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
elif [[ "${preset}" =~ ^(3|4)$ ]]; then elif [[ "${preset}" =~ ^(3|4)$ ]]; then
homeform="y" homeform="y"
elif [[ -z "${smartpart}" || -z "${preset}" ]]; then elif [[ -z "${smartpart}" || -z "${preset}" ]]; then
BLUE " YELLOW "
> A ${nc}/Home ${blue}partition has been detected. Format as ${nc}${fsname}${blue} ? [y/N] > A /Home partition has been detected. Format as ${fsname} ? [y/N]${cyan}
>> ${nc}Selecting ${bwhite}[N] ${nc}will re-use the ${yellowl}existing /Home ${nc}partition
" "
read -r -p " read -r -p "
@@ -5198,7 +5201,11 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
until mount_home; do : ; done until mount_home; do : ; done
fi fi
elif [[ "${homeform}" == "n" ]]; then elif [[ "${homeform}" == "n" ]]; then
skip mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort
sleep 0.2
NC "
==> [${green}Unformatted /Home Mounted OK${nc}]
"
else else
y_n y_n
until ask_homepart_form; do : ; done until ask_homepart_form; do : ; done
@@ -5479,10 +5486,12 @@ ask_homepart_form() {
elif [[ "${preset}" =~ ^(3|4)$ ]]; then elif [[ "${preset}" =~ ^(3|4)$ ]]; then
homeform="y" homeform="y"
elif [[ -z "${smartpart}" || -z "${preset}" ]]; then elif [[ -z "${smartpart}" || -z "${preset}" ]]; then
BLUE " YELLOW "
> A /Home partition has been detected. Format as ${fsname} ? [y/N]${cyan}
> A${nc} ${cyan}/Home ${blue}partition has been detected. Format as ${nc}${fsname}${blue} ? [y/N] >> ${nc}Selecting ${bwhite}[N] ${nc}will re-use the ${yellowl}existing /Home ${nc}partition
" "
read -r -p " read -r -p "
@@ -5513,7 +5522,11 @@ ask_homepart_form() {
until mount_home; do : ; done until mount_home; do : ; done
fi fi
elif [[ "${homeform}" == "n" ]]; then elif [[ "${homeform}" == "n" ]]; then
skip mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort
sleep 0.2
NC "
==> [${green}Unformatted /Home Mounted OK${nc}]
"
else else
y_n y_n
return 1 return 1
@@ -6090,9 +6103,12 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
return 1 return 1
fi fi
elif [[ "${homecrypt}" == "no" ]]; then elif [[ "${homecrypt}" == "no" ]]; then
BLUE " YELLOW "
> A ${nc}/Home ${blue}partition has been detected. Format as${nc} ${fsname}${blue}? [y/N] > A /Home partition has been detected. Format as ${fsname} ? [y/N]${cyan}
>> ${nc}Selecting ${bwhite}[N] ${nc}will re-use the ${yellowl}existing /Home ${nc}partition
" "
read -r -p " read -r -p "
@@ -6117,7 +6133,11 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}LUKS
return 1 return 1
fi fi
elif [[ "${homeform}" == "n" ]]; then elif [[ "${homeform}" == "n" ]]; then
skip mount --mkdir "${home_dev}" /mnt/home > "${void}" 2> "${log}" || err_abort
sleep 0.2
NC "
==> [${green}Unformatted /Home Mounted OK${nc}]
"
else else
y_n y_n
return 1 return 1
@@ -6139,7 +6159,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 OK${nc}] ==> [${green}Unformatted /ESP Mounted OK${nc}]
" "
else else
line2 line2