mirror of
https://gitlab.com/prism7/archery.git
synced 2025-02-15 08:29:17 +01:00
Code optimization
This commit is contained in:
parent
335266a64f
commit
02f8c57372
1 changed files with 4 additions and 9 deletions
13
Amelia.sh
13
Amelia.sh
|
@ -2348,22 +2348,16 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
|
|||
|
||||
if [[ "${fs}" == "2" && "${swapmode}" == "1" ]] ; then
|
||||
preset="2"
|
||||
elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] ; then
|
||||
preset="1"
|
||||
elif [[ "${fs}" == "2" && "${swapmode}" == "3" ]] ; then
|
||||
elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] || [[ "${fs}" == "2" && "${swapmode}" == "3" ]] ; then
|
||||
preset="1"
|
||||
elif [[ "${fs}" == "1" ]] ; then
|
||||
if [[ "${sep_home}" == "y" && "${swapmode}" == "1" ]] ; then
|
||||
preset="4"
|
||||
elif [[ "${sep_home}" == "y" && "${swapmode}" == "2" ]] ; then
|
||||
preset="3"
|
||||
elif [[ "${sep_home}" == "y" && "${swapmode}" == "3" ]] ; then
|
||||
elif [[ "${sep_home}" == "y" && "${swapmode}" == "2" ]] || [[ "${sep_home}" == "y" && "${swapmode}" == "3" ]]; then
|
||||
preset="3"
|
||||
elif [[ "${sep_home}" == "n" && "${swapmode}" == "1" ]] ; then
|
||||
preset="2"
|
||||
elif [[ "${sep_home}" == "n" && "${swapmode}" == "2" ]] ; then
|
||||
preset="1"
|
||||
elif [[ "${sep_home}" == "n" && "${swapmode}" == "3" ]] ; then
|
||||
elif [[ "${sep_home}" == "n" && "${swapmode}" == "2" ]] || [[ "${sep_home}" == "n" && "${swapmode}" == "3" ]]; then
|
||||
preset="1"
|
||||
fi
|
||||
else
|
||||
|
@ -3560,6 +3554,7 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}A
|
|||
###################################################################################################
|
||||
manual_mode (){
|
||||
|
||||
volumes="$(fdisk -l | grep '^/dev' | cat --number)"
|
||||
if [[ -e "${home_dev}" && "${sep_home}" == "y" ]]; then
|
||||
if [[ "${fs}" == "1" ]]; then
|
||||
until form_efi; do : ; done
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue