feat: aerc, newsraft

bin/am

@@ -6,13 +6,10 @@
 # support for /mnt
 
 function get_row() {
-    local pos row
+    local row _col
 
-    printf '\e[6n' >&2
-    read -sdRr pos
-    pos="${pos#*[}"
-    row="${pos%\;*}"
-    echo "$row"
+    IFS=';' read -sdR -p $'\e[6n' row _col
+    echo "${row#??}"
 }
 
 ROW="$(($(get_row) + 1))"
@@ -25,47 +22,27 @@ function clear_output() {
     done
 }
 
-function umount_all() {
-    local disks
+function main() {
+    while true; do
+        readarray -t LSBLK <<< "$(lsblk -n --paths --list | grep part)"
 
-    readarray -t disks <<< "$(mount | grep udisks2 | cut -f1 -d' ')"
+        COLUMNS=1
+        select dev in "${LSBLK[@]}"; do
+            if [ -z "$dev" ]; then
+                clear_output
+                break
+            fi
+            name="$(awk '{print $1}' <<< "$dev")"
 
-    umount "${disks[@]}"
-    echo "unmounted ${disks[*]}"
+            clear_output
+            if mount | grep -q "$name"; then
+                umount "$name"
+            else
+                udisksctl mount -b "$name" > /dev/null
+            fi
+            break
+        done || exit
+    done
 }
 
-if ! [ -t 1 ]; then
-    exit 1
-fi
-
-while getopts a o; do
-    case "$o" in
-        a)
-            umount_all
-            exit
-            ;;
-        *)
-            ;;
-    esac
-done
-
-while true; do
-    readarray -t LSBLK <<< "$(lsblk -n --paths --list | grep part)"
-
-    COLUMNS=1
-    select dev in "${LSBLK[@]}"; do
-        if [ -z "$dev" ]; then
-            clear_output
-            break
-        fi
-        name="$(cut -f1 -d' ' <<< "$dev")"
-
-        clear_output
-        if mount | grep -q "$name"; then
-            umount "$name"
-        else
-            udisksctl mount -b "$name" > /dev/null
-        fi
-        break
-    done || exit
-done
+main "$@"