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: A few prompts have been edited for better aesthetics

Browse Source
This commit is contained in:
Jane Doe
2025-12-13 17:15:32 +02:00
parent 500f6afd60
commit ac7d84883d
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Amelia.sh
+36 -25
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.6 # Version: 1.1.7
set -euo pipefail set -euo pipefail
################################################################################################### ###################################################################################################
@@ -4355,8 +4355,9 @@ ${multi_swap}
>> ${nc}Linux x86-64 /Root partition ${green}OK " #ATTENTION >> ${nc}Linux x86-64 /Root partition ${green}OK " #ATTENTION
else else
rootprt="ok" rootprt="ok"
local prompt="Confirmed /Root Partition" sleep 0.2
ok GREEN "
>> ${yellowl}Confirmed ${nc}Linux x86-64 /Root partition ${green}OK " #ATTENTION
fi fi
else else
sleep 0.2 sleep 0.2
@@ -4376,7 +4377,7 @@ ${multi_swap}
espprt="fail" espprt="fail"
sleep 0.2 sleep 0.2
RED " RED "
>> ${yellowl}EFI System ${nc}partition not detected " #ATTENTION >> ${yellowl}/EFI System ${nc}partition not detected " #ATTENTION
fi fi
if [[ -e "${esp_dev}" ]]; then if [[ -e "${esp_dev}" ]]; then
@@ -4391,17 +4392,18 @@ ${multi_swap}
espprt="ok" espprt="ok"
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}EFI System partition ${green}OK " #ATTENTION >> ${nc}/EFI System partition ${green}OK " #ATTENTION
else else
espprt="ok" espprt="ok"
local prompt="Confirmed /EFI System Partition" sleep 0.2
ok GREEN "
>> ${yellowl}Confirmed ${nc}/EFI System partition ${green}OK " #ATTENTION
fi fi
else else
espprt="ok" espprt="ok"
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}EFI System partition ${green}OK " #ATTENTION >> ${nc}/EFI System partition ${green}OK " #ATTENTION
fi fi
fi fi
@@ -4417,31 +4419,33 @@ ${multi_swap}
espprt="ok" espprt="ok"
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}EFI System partition ${green}OK " #ATTENTION >> ${nc}/EFI System partition ${green}OK " #ATTENTION
else else
espprt="ok" espprt="ok"
local prompt="Confirmed /EFI System Partition" sleep 0.2
ok GREEN "
>> ${yellowl}Confirmed ${nc}/EFI System partition ${green}OK " #ATTENTION
fi fi
else else
espprt="ok" espprt="ok"
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}EFI System partition ${green}OK " #ATTENTION >> ${nc}/EFI System partition ${green}OK " #ATTENTION
fi fi
if [[ "${autoxboot}" == "y" ]]; then if [[ "${autoxboot}" == "y" ]]; then
if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}Linux Extended Boot partition ${green}OK " #ATTENTION >> ${nc}Linux /Extended Boot partition ${green}OK " #ATTENTION
else else
local prompt="Confirmed /XBOOTLDR Partition" sleep 0.2
ok GREEN "
>> ${yellowl}Confirmed ${nc}Linux /Extended Boot partition ${green}OK " #ATTENTION
fi fi
else else
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}Linux Extended Boot partition ${green}OK " #ATTENTION >> ${nc}Linux /Extended Boot partition ${green}OK " #ATTENTION
fi fi
else else
xbootprt="fail" xbootprt="fail"
@@ -4451,7 +4455,7 @@ ${multi_swap}
>> ${yellowl}WARNING: ${nc}ESP's size is not ${bwhite}adequate " #ATTENTION >> ${yellowl}WARNING: ${nc}ESP's size is not ${bwhite}adequate " #ATTENTION
sleep 0.2 sleep 0.2
RED " RED "
>> ${yellowl}Linux Extended Boot ${nc}partition not detected " #ATTENTION >> ${yellowl}Linux /Extended Boot ${nc}partition not detected " #ATTENTION
fi fi
elif [[ "${multibooting}" == "n" ]]; then elif [[ "${multibooting}" == "n" ]]; then
espprt="fail" espprt="fail"
@@ -4474,15 +4478,16 @@ ${multi_swap}
if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}EFI System partition ${green}OK " #ATTENTION >> ${nc}/EFI System partition ${green}OK " #ATTENTION
else else
local prompt="Confirmed /EFI System Partition" sleep 0.2
ok GREEN "
>> ${yellowl}Confirmed ${nc}/EFI System partition ${green}OK " #ATTENTION
fi fi
else else
sleep 0.2 sleep 0.2
GREEN " GREEN "
>> ${nc}EFI System partition ${green}OK " #ATTENTION >> ${nc}/EFI System partition ${green}OK " #ATTENTION
fi fi
fi fi
fi fi
@@ -4498,8 +4503,9 @@ ${multi_swap}
GREEN " GREEN "
>> ${nc}Linux /Home partition ${green}OK " #ATTENTION >> ${nc}Linux /Home partition ${green}OK " #ATTENTION
else else
local prompt="Confirmed /Home Partition" sleep 0.2
ok GREEN "
>> ${yellowl}Confirmed ${nc}Linux /Home partition ${green}OK " #ATTENTION
fi fi
else else
GREEN " GREEN "
@@ -4523,8 +4529,9 @@ ${multi_swap}
GREEN " GREEN "
>> ${nc}Linux /Swap partition ${green}OK " #ATTENTION >> ${nc}Linux /Swap partition ${green}OK " #ATTENTION
else else
local prompt="Confirmed /Swap Partition" sleep 0.2
ok GREEN "
>> ${yellowl}Confirmed ${nc}Linux /Swap partition ${green}OK " #ATTENTION
fi fi
else else
sleep 0.2 sleep 0.2
@@ -4695,6 +4702,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Encry
> Utilize LUKS encryption for your system ? " > Utilize LUKS encryption for your system ? "
NC " NC "
* Type '${cyan}no${nc}' to proceed without encryption * Type '${cyan}no${nc}' to proceed without encryption
* Type '${cyan}yes${nc}' to encrypt your ${yellowl}${LuksParts} * Type '${cyan}yes${nc}' to encrypt your ${yellowl}${LuksParts}
@@ -5014,6 +5022,9 @@ Enter a Mode number: "
################################################################################################### ###################################################################################################
auto_mode() { auto_mode() {
if [[ "${swapmode}" == "1" ]]; then
line2
fi
espfs="$(lsblk -dno FSTYPE "${esp_dev}")" espfs="$(lsblk -dno FSTYPE "${esp_dev}")"
sleep 0.2 sleep 0.2
NC " NC "