Reload disks after invalid choices

lib/modules/partition/choose-disk.fish

@@ -1,5 +1,7 @@
 #!/bin/env fish
 function chooseDisk -a outFile message
+
+    while true
         set -l disks
 
         lsblk -do NAME,SIZE,TYPE | while read disk
@@ -14,7 +16,6 @@ function chooseDisk -a outFile message
         set -l padding (math (string length "$diskCount") + 1)
 
         if [ "$diskCount" -gt 0 ]
-        while true
             echo "$message"
             set -l prefix
 
@@ -31,17 +32,19 @@ function chooseDisk -a outFile message
             read -lP "Your choice: " choice
             or exit 1
 
+            if math "0+$choice" &> /dev/null
                 if [ "$choice" -ge 1 ] && [ "$choice" -le "$diskCount" ]
                     set -l disk (string split -n " " "$disks[$(math "$choice" + 1)]")
                     echo "/dev/$disk[1]" > $outFile
                     return
-            else
+                end
+            end
+
             echo "The specified choice \"$choice\" is invalid!"
-            end
-        end
         else
             echo "No valid disk found!" >&2
         end
+    end
 
     return 1
 end