diff --git a/Amelia.sh b/Amelia.sh index 6ff42d9..7d2a14a 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -101,7 +101,6 @@ reload (){ sleep 0.3 NC " - --> [${green}Reloading${nc}] " } invalid (){ @@ -1016,8 +1015,7 @@ Enter [y/n]: " sleep 0.3 YELLOW " - ### A /Home Partition will be created - ";; + ### A /Home Partition will be created ";; n) skip echo;; @@ -2417,11 +2415,11 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati REDBG " ------------------------------------------------------------ " line2 if [[ -e "${instl_drive}" && "${use_man}" != "yes" ]]; then - BLUE " - - > Use ${nc}${cyan}'Smart Partitioning' ${blue}on disk ${nc}'${instl_drive}'${blue} ? [y/n] - - " + line2 + YELLOWBG " ------------------------------------------------------- " + YELLOWBG " > Apply 'Smart Partitioning' on disk '${instl_drive}'? [y/n] " + YELLOWBG " ------------------------------------------------------- " + echo read -r -p " ==> " smartpart 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} - ### 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 " -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 " ==> " prcnt echo @@ -2523,14 +2521,14 @@ Enter a Custom Percentage number ${nc}${cyan}(e.g. 30) ${bwhite}(empty to skip)$ sleep 0.3 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 rootsize="$((capacity*"${prcnt}"/100/1024000000))" sleep 0.3 YELLOW " - ### Custom /Root Partition size ${nc}[${rootsize} GiB] + ### Custom /Root Partition's size selected ${nc}[${rootsize} GiB] " elif [[ "${prcnt}" == "100" ]]; then sleep 0.3 @@ -3147,7 +3145,7 @@ ${multi_swap} BLUE " - > Proceed with the current partitioning layout ? [y/n]${nc} + > Proceed using the current partitioning layout ? [y/n]${nc} " read -r -p " ==> " partok @@ -3184,7 +3182,7 @@ ${multi_swap} BLUE " - > Proceed with the current partitioning layout ? [y/n]${nc} + > Proceed using the current partitioning layout ? [y/n]${nc} " read -r -p " ==> " partok @@ -3209,11 +3207,12 @@ ${multi_swap} elif [[ "${sanity}" == "no" ]]; then sleep 0.3 RED " - + + --------------------------- ### ${yellow}SANITY CHECK FAILED${red} ### ---------------------------" - sleep 3 + sleep 1 if [[ "${smartpart}" == "n" && -z "${preset}" ]] ; then reload until manual_part; do : ; done