slococo
/
calsais
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor

This commit is contained in:
Santiago Lo Coco 2022-01-29 11:07:40 -03:00
parent 507438831b
commit 40c7c3f150
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.sh
View File

@ -43,7 +43,7 @@ partDisks() {
setDelimiters ""
formatOptions <(lsblk -dpnlo NAME,SIZE -e 7,11)
disks=$(lsblk -dpnl -e 7,11 | wc -l)
result=$(dialog --menu "\nSelect the disk." 0 30 $disks "${options[@]}" 3>&1 1>&2 2>&3)
result=$(dialog --menu "\nSelect the disk." 0 30 "$disks" "${options[@]}" 3>&1 1>&2 2>&3)
exitIfCancel "You must select a disk."
disk=$(echo "$result" | cut -d' ' -f1)
@ -59,11 +59,11 @@ partDisks() {
# TODO: Ask for home partition
formatOptions <(lsblk "${disk}" -pnlo NAME,SIZE,MOUNTPOINTS | sed -n '2~1p')
result=$(dialog --menu "\nSelect the boot partition." 0 30 $parts "${options[@]}" 3>&1 1>&2 2>&3)
result=$(dialog --menu "\nSelect the boot partition." 0 30 "$parts" "${options[@]}" 3>&1 1>&2 2>&3)
exitIfCancel "You must select the boot partition."
bootPart=$(echo "$result" | cut -d' ' -f1)
formatOptions <(lsblk "${disk}" -pnlo NAME,SIZE,MOUNTPOINTS | sed -n '2~1p' | awk '$0!~v' v="$bootPart")
result=$(dialog --menu "\nSelect the root partition." 0 30 $parts "${options[@]}" 3>&1 1>&2 2>&3)
result=$(dialog --menu "\nSelect the root partition." 0 30 "$parts" "${options[@]}" 3>&1 1>&2 2>&3)
exitIfCancel "You must select the root partition."
rootPart=$(echo "$result" | cut -d' ' -f1)
@ -72,7 +72,7 @@ partDisks() {
dialog --yesno "\nDo you have a swap partition?" 7 34
if [ $? -eq 0 ]; then
formatOptions <(lsblk "${disk}" -pnlo NAME,SIZE,MOUNTPOINTS | sed -n '2~1p' | awk '$0!~v' v="$bootPart|$rootPart")
result=$(dialog --menu "\nSelect the swap partition." 0 30 $parts "${options[@]}" 3>&1 1>&2 2>&3)
result=$(dialog --menu "\nSelect the swap partition." 0 30 "$parts" "${options[@]}" 3>&1 1>&2 2>&3)
exitIfCancel "You must select the swap partition."
swapPart=$(echo "$result" | cut -d' ' -f1)
else