Prompt shows partition labels

This commit is contained in:
Larry Steele 2018-11-07 00:27:41 -05:00
parent 736141584c
commit 01f82273af

View File

@ -16,7 +16,7 @@ getmount() { \
} }
mountusb() { \ mountusb() { \
chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')" chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk -F'[ ]' '{print $2}')"
sudo -A mount "$chosen" && exit 0 sudo -A mount "$chosen" && exit 0
getmount "/mnt /media /mount /home -maxdepth 5 -type d" getmount "/mnt /media /mount /home -maxdepth 5 -type d"
sudo -A mount "$chosen" "$mp" && pgrep -x dunst && notify-send "$chosen mounted to $mp." sudo -A mount "$chosen" "$mp" && pgrep -x dunst && notify-send "$chosen mounted to $mp."
@ -37,8 +37,7 @@ asktype() { \
} }
anddrives=$(simple-mtpfs -l 2>/dev/null) anddrives=$(simple-mtpfs -l 2>/dev/null)
usbdrives="$(lsblk -rpo "name,type,size,mountpoint" | awk '$2=="part"&&$4==""{printf "%s (%s)\n",$1,$3}')" usbdrives="$(lsblk -rpo "name,type,size,mountpoint,label" | awk -F'[ ]' '$2=="part" && $4=="" {printf "%s %s (%s)\n",$5,$1,$3}')"
if [ -z "$usbdrives" ]; then if [ -z "$usbdrives" ]; then
[ -z "$anddrives" ] && echo "No USB drive or Android device detected" && exit [ -z "$anddrives" ] && echo "No USB drive or Android device detected" && exit
echo "Android device(s) detected." echo "Android device(s) detected."