albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change: Make changes to a few prompts, for aesthetic reasons

Browse Source
This commit is contained in:
elementrick
2024-07-20 11:05:27 +00:00
parent 9abcec6f38
commit 9ef0695a55
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Amelia.sh
View File

@@ -101,7 +101,6 @@ reload (){
sleep 0.3 sleep 0.3
NC " NC "
--> [${green}Reloading${nc}] " --> [${green}Reloading${nc}] "
} }
invalid (){ invalid (){
@@ -1016,8 +1015,7 @@ Enter [y/n]: "
sleep 0.3 sleep 0.3
YELLOW " YELLOW "
### A /Home Partition will be created ### A /Home Partition will be created ";;
";;
n) n)
skip skip
echo;; echo;;
@@ -2417,11 +2415,11 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
REDBG " ------------------------------------------------------------ " REDBG " ------------------------------------------------------------ "
line2 line2
if [[ -e "${instl_drive}" && "${use_man}" != "yes" ]]; then if [[ -e "${instl_drive}" && "${use_man}" != "yes" ]]; then
BLUE " line2
YELLOWBG " ------------------------------------------------------- "
> Use ${nc}${cyan}'Smart Partitioning' ${blue}on disk ${nc}'${instl_drive}'${blue} ? [y/n] YELLOWBG " > Apply 'Smart Partitioning' on disk '${instl_drive}'? [y/n] "
YELLOWBG " ------------------------------------------------------- "
" echo
read -r -p " read -r -p "
==> " smartpart ==> " smartpart
echo echo
@@ -2497,7 +2495,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
### Total detected capacity of disk ${nc}${sgdrive} ${yellow}is ${nc}${cap_gib} GiB${yellow} ### Total detected capacity of disk ${nc}${sgdrive} ${yellow}is ${nc}${cap_gib} GiB${yellow}
### Default /Root Partition's size is aprox. 25% of total disk capacity ${nc}[${rootsize} GiB]${yellow} ### Default ${nc}/Root${yellow} Partition's size is aprox. ${nc}25%${yellow} of total disk capacity ${nc}[${rootsize} GiB]${yellow}
@@ -2505,7 +2503,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
BLUE " BLUE "
Enter a Custom Percentage number ${nc}${cyan}(e.g. 30) ${bwhite}(empty to skip)${blue}: " Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
read -r -p " read -r -p "
==> " prcnt ==> " prcnt
echo echo
@@ -2523,14 +2521,14 @@ Enter a Custom Percentage number ${nc}${cyan}(e.g. 30) ${bwhite}(empty to skip)$
sleep 0.3 sleep 0.3
YELLOW " YELLOW "
### Default /Root Partition size ${nc}[${rootsize} GiB] ### Default /Root Partition's size selected ${nc}[${rootsize} GiB]
" "
elif [[ "${prcnt}" -gt "0" && "${prcnt}" -lt "100" ]]; then elif [[ "${prcnt}" -gt "0" && "${prcnt}" -lt "100" ]]; then
rootsize="$((capacity*"${prcnt}"/100/1024000000))" rootsize="$((capacity*"${prcnt}"/100/1024000000))"
sleep 0.3 sleep 0.3
YELLOW " YELLOW "
### Custom /Root Partition size ${nc}[${rootsize} GiB] ### Custom /Root Partition's size selected ${nc}[${rootsize} GiB]
" "
elif [[ "${prcnt}" == "100" ]]; then elif [[ "${prcnt}" == "100" ]]; then
sleep 0.3 sleep 0.3
@@ -3147,7 +3145,7 @@ ${multi_swap}
BLUE " BLUE "
> Proceed with the current partitioning layout ? [y/n]${nc} > Proceed using the current partitioning layout ? [y/n]${nc}
" "
read -r -p " read -r -p "
==> " partok ==> " partok
@@ -3184,7 +3182,7 @@ ${multi_swap}
BLUE " BLUE "
> Proceed with the current partitioning layout ? [y/n]${nc} > Proceed using the current partitioning layout ? [y/n]${nc}
" "
read -r -p " read -r -p "
==> " partok ==> " partok
@@ -3210,10 +3208,11 @@ ${multi_swap}
sleep 0.3 sleep 0.3
RED " RED "
--------------------------- ---------------------------
### ${yellow}SANITY CHECK FAILED${red} ### ### ${yellow}SANITY CHECK FAILED${red} ###
---------------------------" ---------------------------"
sleep 3 sleep 1
if [[ "${smartpart}" == "n" && -z "${preset}" ]] ; then if [[ "${smartpart}" == "n" && -z "${preset}" ]] ; then
reload reload
until manual_part; do : ; done until manual_part; do : ; done