From cb3c609ffa34a36265ba7675fc79aea993ba3959 Mon Sep 17 00:00:00 2001 From: Lawrence Steele Date: Mon, 5 Nov 2018 02:07:32 -0500 Subject: [PATCH] Conditional formatting for partition labels Conditionally formats dmenumount prompt with partition labels only if the label exists --- .scripts/dmenumount | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.scripts/dmenumount b/.scripts/dmenumount index db942eec..d6639c3c 100755 --- a/.scripts/dmenumount +++ b/.scripts/dmenumount @@ -18,7 +18,7 @@ getmount() { \ mountusb() { \ chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk '{print $2}')" sudo -A mount "$chosen" && exit 0 - getmount "/mnt /media /mount /home -maxdepth 5 -type d" + getmount "/mnt /media /mount -maxdepth 3 -type d" 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) -usbdrives="$(lsblk -rpo "name,type,size,mountpoint,label" | awk -F'[ ]' '$2=="part"&&$4==""{printf "[%s] %s (%s)\n",$5,$1,$3}')" - +usbdrives="$(lsblk -rpo "name,type,size,mountpoint,label" | awk -F'[ ]' '$2=="part" && $4=="" {str=($5=="") ? sprintf("%s (%s)\n",$1,$3) : sprintf("[%s] %s (%s)\n",$5,$1,$3); printf("%s",str)}')" if [ -z "$usbdrives" ]; then [ -z "$anddrives" ] && echo "No USB drive or Android device detected" && exit echo "Android device(s) detected."