Fixed a bug preventing auto-guided partition formatting

This commit is contained in:
elementrick 2024-06-29 17:28:16 +00:00
parent 7d55f08ae3
commit 090b654c3c

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Amelia Installer by elementrick # Amelia Installer by elementrick
# Version: 6.3 # Version: 6.4
set -euo pipefail set -euo pipefail
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
@ -2350,15 +2350,21 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
preset="2" preset="2"
elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] ; then elif [[ "${fs}" == "2" && "${swapmode}" == "2" ]] ; then
preset="1" preset="1"
elif [[ "${fs}" == "2" && "${swapmode}" == "3" ]] ; then
preset="1"
elif [[ "${fs}" == "1" ]] ; then elif [[ "${fs}" == "1" ]] ; then
if [[ "${sep_home}" == "y" && "${swapmode}" == "1" ]] ; then if [[ "${sep_home}" == "y" && "${swapmode}" == "1" ]] ; then
preset="4" preset="4"
elif [[ "${sep_home}" == "y" && "${swapmode}" == "2" ]] ; then elif [[ "${sep_home}" == "y" && "${swapmode}" == "2" ]] ; then
preset="3" preset="3"
elif [[ "${sep_home}" == "y" && "${swapmode}" == "3" ]] ; then
preset="3"
elif [[ "${sep_home}" == "n" && "${swapmode}" == "1" ]] ; then elif [[ "${sep_home}" == "n" && "${swapmode}" == "1" ]] ; then
preset="2" preset="2"
elif [[ "${sep_home}" == "n" && "${swapmode}" == "2" ]] ; then elif [[ "${sep_home}" == "n" && "${swapmode}" == "2" ]] ; then
preset="1" preset="1"
elif [[ "${sep_home}" == "n" && "${swapmode}" == "3" ]] ; then
preset="1"
fi fi
else else
sleep 0.3 sleep 0.3