swaydots

commit ca84ac74f92184466a2cc85a769574959ab86bbc
parent 93704ef70721b550a06761a432c9880f0bee71ef
Author: awy <awy@awy.one>
Date:   Sat, 26 Jul 2025 17:31:44 +0300

mounter fixes

lsblk doesn't show fstype if non-root. case switch statement fallsback
to * because parttype contains "\r" character. since we can now properly
indentify fstype, ntfs-3g package is no longer needed.

Diffstat:
M
.local/bin/mounter
 | 
6
+++---
M
dependencies.txt
 | 
1
-

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.local/bin/mounter b/.local/bin/mounter
@@ -18,7 +18,7 @@ mountedphones="$(rg "simple-mtpfs" /etc/mtab)"
 done)"
 
 # Check for drives.
-lsblkoutput="$(lsblk -rpo "uuid,name,type,size,label,mountpoint,fstype")"
+lsblkoutput="$(doas_askpass lsblk -rpo "uuid,name,type,size,label,mountpoint,fstype")"
 # Get all LUKS drives
 allluks="$(echo "$lsblkoutput" | rg crypto_LUKS)"
 # Get a list of the LUKS drive UUIDs already decrypted.
@@ -73,12 +73,12 @@ case "$chosen" in
 	💾*)
 		chosen="${chosen%% *}"
 		chosen="${chosen:1}"	# This is a bashism.
-		parttype="$(echo "$lsblkoutput" | rg "$chosen")"
+		parttype="$(echo "$lsblkoutput" | rg "$chosen" | awk '{print $NF}' | tr -d '[:space:]\r\n')"
 		attemptmount || getmount
 		case "${parttype##* }" in
 			vfat) doas_askpass mount -t vfat "$chosen" "$mp" -o rw,umask=0000 ;;
 			btrfs) doas_askpass mount "$chosen" "$mp" ;;
-			ntfs) doas_askpass mount -t ntfs "$chosen" "$mp" ;;
+			ntfs) doas_askpass mount -t ntfs3 "$chosen" "$mp" ;;
 			*) doas_askpass mount "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)" ;;
 		esac
 		notify-send "💾Drive Mounted." "$chosen mounted to $mp."
diff --git a/dependencies.txt b/dependencies.txt
@@ -87,7 +87,6 @@ exfat-utils
 tesseract-data-eng
 tesseract
 mandoc
-ntfs-3g
 calcurse
 cmake
 wlrctl