From 2cf3ea2f828f6da07adff92a7dc5bce6069620ab Mon Sep 17 00:00:00 2001
From: Timmy Keller <tjk@tjkeller.xyz>
Date: Mon, 11 Oct 2021 15:08:51 -0500
Subject: sinking
---
keyboard/mnt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'keyboard/mnt')
diff --git a/keyboard/mnt b/keyboard/mnt
index 5f82aa4..7547912 100755
--- a/keyboard/mnt
+++ b/keyboard/mnt
@@ -1,10 +1,11 @@
#!/bin/sh
-if partition=`lsblk --noheadings --paths --raw | awk '/part $/ { print $1, "(" $4 ")" }' | dmenu -p "Choose drive to mount: " | sed 's/ .*//'` \
+# '/part\s*$\|rom\s*$/!d; s/\s*[^[:space:]]*\s*$/\)/; s/\s/ \(/' # More correct in my opinion, but slower
+if partition=`lsblk -npro "name,size,type,mountpoint" | sed '/part $\|rom $/!d; s/ [a-z]* $/\)/; s/ / \(/' | dmenu -p "Choose drive to mount: " | cut -d' ' -f1` \
&& [ -n "$partition" ] \
-&& mountpoint=`ls --directory /media/mnt/*/ | dmenu -p "Choose mountpoint: "` \
+&& mountpoint=`ls -d /media/mnt/slot*/ | dmenu -p "Choose mountpoint: "` \
&& [ -n "$mountpoint" ]
then
- doas mount "$partition" "$mountpoint" \
+ doas mount "$partition" "$mountpoint"; user="$(whoami)"; ug="$(groups | cut -d' ' -f1)"; doas chown "$user":"$ug" "$mountpoint" \
&& notify-send --urgency low "Device Successfully Mounted" "Successfully Mounted partition \"$partition\" to mountpoint \"$mountpoint\"" \
|| notify-send --urgency low "Error Mounting Device" "Could not mount partition \"$partition\" to mountpoint \"$mountpoint\""
fi
--
cgit v1.2.3