manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reload disks after invalid choices

Browse source
This commit is contained in:
Manuel Thalmann 2024-09-22 20:07:19 +02:00
parent bdb16a3e9f
commit 2dd1b1326b
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/modules/partition/choose-disk.fish
View file

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