1 files changed, 18 insertions, 6 deletions

diff --git a/.local/bin/dmenu/mount-device b/.local/bin/dmenu/mount-device
index e325a65..c2decd5 100755
--- a/.local/bin/dmenu/mount-device
+++ b/.local/bin/dmenu/mount-device
@@ -2,16 +2,22 @@
 # Script for mounting block devices
 
 # Set askpass program for authentication
-export SUDO_ASKPASS=/usr/bin/ssh-askpass
+#export SUDO_ASKPASS=/usr/bin/ssh-askpass
 
 # Check for and get device to mount from user
-devs="$(lsblk -lp | grep "part $" | awk '{print $1,"-",$4}')"
+devs="$(lsblk -lpo NAME,FSTYPE,SIZE,TYPE,MOUNTPOINT | grep "part\s*$\|crypto_LUKS" | awk '{print $1,"-",$3}')"
 [ "$devs" = "" ] && exit 0
-dev="$(echo $devs | dmenu -i -p "Select device" | cut -d ' ' -f 1)"
+dev="$(echo "$devs" | dmenu -i -p "Select device" | cut -d ' ' -f 1)"
 [ "$dev" = "" ] && exit 0
 
+# Open and map drive if it is encrypted
+crypt=0
+[ "$(lsblk -no FSTYPE $dev)" = "crypto_LUKS" ] && crypt=1 && \
+                mapname="$(echo -n "" | dmenu -i -p "Enter device mapper name")" && \
+                sudo cryptsetup open $dev $mapname
+
 # Attempt to mount without mountpoint for devices in /etc/fstab
-sudo -A mount "$dev" 2>/dev/null && exit 0
+sudo mount "$dev" 2>/dev/null && exit 0
 
 # Get mountpoint from user
 mntpnt="$(find /mnt -maxdepth 3 -type d 2>/dev/null | dmenu -i -p "Select mountpoint")"
@@ -23,5 +29,11 @@ mntpnt="$(find /mnt -maxdepth 3 -type d 2>/dev/null | dmenu -i -p "Select mountp
                 dmenu -i -p "$mntpnt does not exist, would you like to create it?")" && \
                 ([ "$create" = "Yes" ] && sudo -A mkdir -p $mntpnt || exit 0)
 
-sudo -A mount $dev $mntpnt && pgrep -x dunst && notify-send "$dev mounted to $mntpnt"
-
+# Mount the device
+if [ $crypt -eq 1 ]; then
+        sudo -A mount /dev/mapper/$mapname $mntpnt && pgrep -x dunst && \
+                        notify-send "$dev mounted to $mntpnt"
+else
+        sudo -A mount $dev $mntpnt && pgrep -x dunst && \
+                        notify-send "$dev mounted to $mntpnt"
+fi