Mount scripts now use dmenu lines

2 files changed, 6 insertions, 3 deletions

diff --git a/dmenuMount.sh b/dmenuMount.sh
index 00c1e73..ce0d93b 100644
--- a/dmenuMount.sh
+++ b/dmenuMount.sh
@@ -20,12 +20,14 @@ pgrep -x dmenu && exit
 
 mountable=$(lsblk -lp | grep "part $" | awk '{print $1, "(" $4 ")"}')
 [[ "$mountable" = "" ]] && exit 1
-chosen=$(echo "$mountable" | dmenu -i -p "Mount which drive?" | awk '{print $1}')
+lines=$(echo "$mountable" | wc -l)
+chosen=$(echo "$mountable" | dmenu -i -l $lines -p "Mount which drive?" | awk '{print $1}')
 [[ "$chosen" = "" ]] && exit 1
 #sudo -u inigo mount "$chosen" && exit 0
 mount "$chosen" && notify-send "$chosen mounted" && exit 0
 dirs=$(find /media /home/inigo/mounts -type d -maxdepth 3 -empty 2>/dev/null)
-mountpoint=$(echo "$dirs" | dmenu -i -p "Type in mount point.")
+lines=$(echo "$dirs" | wc -l)
+mountpoint=$(echo "$dirs" | dmenu -i -l $lines -p "Type in mount point.")
 [[ "$mountpoint" = "" ]] && exit 1
 if [[ ! -d "$mountpoint" ]]; then
 	bash /home/inigo/scripts/prompt.sh "$mountpoint does not exist. Create it?" "mkdir -p $mountpoint"
diff --git a/dmenuUmount.sh b/dmenuUmount.sh
index 873ad2d..f50f4aa 100644
--- a/dmenuUmount.sh
+++ b/dmenuUmount.sh
@@ -16,7 +16,8 @@
 exclusionregex="\(/boot\|/home\|/\)$"
 drives=$(lsblk -lp | grep "part /" | grep -v "$exclusionregex" | awk '{print $1, "(" $4 ")", "on", $7}')
 [[ "$drives" = "" ]] && exit
-chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}')
+lines=$(echo "$drives" | wc -l)
+chosen=$(echo "$drives" | dmenu -i -l $lines -p "Unmount which drive?" | awk '{print $1}')
 [[ "$chosen" = "" ]] && exit
 umount $chosen && pgrep -x dunst && notify-send "$chosen unmounted."
 #umount $chosen && notify-send "$chosen unmounted."