mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 01:17:35 +02:00
Change: A few prompts have been edited for better aesthetics
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
# Amelia Installer
|
||||
# Source: https://gitlab.com/prism7/archery
|
||||
# Version: 1.1.6
|
||||
# Version: 1.1.7
|
||||
|
||||
set -euo pipefail
|
||||
###################################################################################################
|
||||
@@ -4355,8 +4355,9 @@ ${multi_swap}
|
||||
>> ${nc}Linux x86-64 /Root partition ${green}OK " #ATTENTION
|
||||
else
|
||||
rootprt="ok"
|
||||
local prompt="Confirmed /Root Partition"
|
||||
ok
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${yellowl}Confirmed ${nc}Linux x86-64 /Root partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
sleep 0.2
|
||||
@@ -4376,7 +4377,7 @@ ${multi_swap}
|
||||
espprt="fail"
|
||||
sleep 0.2
|
||||
RED "
|
||||
>> ${yellowl}EFI System ${nc}partition not detected " #ATTENTION
|
||||
>> ${yellowl}/EFI System ${nc}partition not detected " #ATTENTION
|
||||
fi
|
||||
|
||||
if [[ -e "${esp_dev}" ]]; then
|
||||
@@ -4391,17 +4392,18 @@ ${multi_swap}
|
||||
espprt="ok"
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}EFI System partition ${green}OK " #ATTENTION
|
||||
>> ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
else
|
||||
espprt="ok"
|
||||
local prompt="Confirmed /EFI System Partition"
|
||||
ok
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${yellowl}Confirmed ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
espprt="ok"
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}EFI System partition ${green}OK " #ATTENTION
|
||||
>> ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -4417,31 +4419,33 @@ ${multi_swap}
|
||||
espprt="ok"
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}EFI System partition ${green}OK " #ATTENTION
|
||||
>> ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
else
|
||||
espprt="ok"
|
||||
local prompt="Confirmed /EFI System Partition"
|
||||
ok
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${yellowl}Confirmed ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
espprt="ok"
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}EFI System partition ${green}OK " #ATTENTION
|
||||
>> ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
if [[ "${autoxboot}" == "y" ]]; then
|
||||
if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}Linux Extended Boot partition ${green}OK " #ATTENTION
|
||||
>> ${nc}Linux /Extended Boot partition ${green}OK " #ATTENTION
|
||||
else
|
||||
local prompt="Confirmed /XBOOTLDR Partition"
|
||||
ok
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${yellowl}Confirmed ${nc}Linux /Extended Boot partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}Linux Extended Boot partition ${green}OK " #ATTENTION
|
||||
>> ${nc}Linux /Extended Boot partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
xbootprt="fail"
|
||||
@@ -4451,7 +4455,7 @@ ${multi_swap}
|
||||
>> ${yellowl}WARNING: ${nc}ESP's size is not ${bwhite}adequate " #ATTENTION
|
||||
sleep 0.2
|
||||
RED "
|
||||
>> ${yellowl}Linux Extended Boot ${nc}partition not detected " #ATTENTION
|
||||
>> ${yellowl}Linux /Extended Boot ${nc}partition not detected " #ATTENTION
|
||||
fi
|
||||
elif [[ "${multibooting}" == "n" ]]; then
|
||||
espprt="fail"
|
||||
@@ -4474,15 +4478,16 @@ ${multi_swap}
|
||||
if [[ "${presetpart}" == "y" || "${smartpart}" == "y" ]]; then
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}EFI System partition ${green}OK " #ATTENTION
|
||||
>> ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
else
|
||||
local prompt="Confirmed /EFI System Partition"
|
||||
ok
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${yellowl}Confirmed ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${nc}EFI System partition ${green}OK " #ATTENTION
|
||||
>> ${nc}/EFI System partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -4498,8 +4503,9 @@ ${multi_swap}
|
||||
GREEN "
|
||||
>> ${nc}Linux /Home partition ${green}OK " #ATTENTION
|
||||
else
|
||||
local prompt="Confirmed /Home Partition"
|
||||
ok
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${yellowl}Confirmed ${nc}Linux /Home partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
GREEN "
|
||||
@@ -4523,8 +4529,9 @@ ${multi_swap}
|
||||
GREEN "
|
||||
>> ${nc}Linux /Swap partition ${green}OK " #ATTENTION
|
||||
else
|
||||
local prompt="Confirmed /Swap Partition"
|
||||
ok
|
||||
sleep 0.2
|
||||
GREEN "
|
||||
>> ${yellowl}Confirmed ${nc}Linux /Swap partition ${green}OK " #ATTENTION
|
||||
fi
|
||||
else
|
||||
sleep 0.2
|
||||
@@ -4695,6 +4702,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Encry
|
||||
> Utilize LUKS encryption for your system ? "
|
||||
NC "
|
||||
|
||||
|
||||
* Type '${cyan}no${nc}' to proceed without encryption
|
||||
|
||||
* Type '${cyan}yes${nc}' to encrypt your ${yellowl}${LuksParts}
|
||||
@@ -5014,6 +5022,9 @@ Enter a Mode number: "
|
||||
###################################################################################################
|
||||
auto_mode() {
|
||||
|
||||
if [[ "${swapmode}" == "1" ]]; then
|
||||
line2
|
||||
fi
|
||||
espfs="$(lsblk -dno FSTYPE "${esp_dev}")"
|
||||
sleep 0.2
|
||||
NC "
|
||||
|
||||
Reference in New Issue
Block a user