commit 39a0c9c5fa7b744c6cfea4f8dd1073dc6dfc63d7
parent 8f12c4f8fd797e5a61a11ec57bebf163c4eda000
Author: Luke Smith <luke@lukesmith.xyz>
Date: Thu, 18 Oct 2018 19:46:33 -0400
dmenumount improvments
Diffstat:
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/.scripts/dmenumount b/.scripts/dmenumount
@@ -7,7 +7,7 @@ pgrep -x dmenu && exit
getmount() { \
[ -z "$chosen" ] && exit 1
- mp="$(find $1 2>/dev/null | dmenu -i -p "Type in mount point.")"
+ mp="$(find "$1" 2>/dev/null | dmenu -i -p "Type in mount point.")"
[ "$mp" = "" ] && exit 1
if [ ! -d "$mp" ]; then
mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?")
@@ -16,17 +16,14 @@ getmount() { \
}
mountusb() { \
- drives="$(lsblk -rpo "name,type,size,mountpoint" | awk '$2=="part"&&$4==""{printf "%s (%s)\n",$1,$3}')"
+ chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')"
sudo -A mount "$chosen" && exit 0
- [ -z "$drives" ] && exit 1
- chosen="$(echo "$drives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')"
getmount "/mnt /media /mount /home -type d -maxdepth 5"
sudo -A mount "$chosen" "$mp" && pgrep -x dunst && notify-send "$chosen mounted to $mp."
}
mountandroid() { \
- drives=$(simple-mtpfs -l)
- chosen=$(echo "$drives" | dmenu -i -p "Which Android device?" | cut -d : -f 1)
+ chosen=$(echo "$anddrives" | dmenu -i -p "Which Android device?" | cut -d : -f 1)
getmount "$HOME -type d -maxdepth 3"
simple-mtpfs --device "$chosen" "$mp"
echo simple-mtpfs --device "$chosen" "$mp"
@@ -39,8 +36,16 @@ asktype() { \
esac
}
-if simple-mtpfs -l; then
- asktype
+anddrives=$(simple-mtpfs -l 2>/dev/null)
+usbdrives="$(lsblk -rpo "name,type,size,mountpoint" | awk '$2=="part"&&$4==""{printf "%s (%s)\n",$1,$3}')"
+
+if [ -z "$usbdrives" ]; then
+ [ -z "$anddrives" ] && echo "No USB drive or Android device detected" && exit
+ echo "Android device detected."
+ mountandroid
else
- mountusb
+ echo "USB drive(s) detected."
+ [ -z "$anddrives" ] && echo "USB drive detected." && mountusb
+ echo "Mountable USB drive(s) and Android device(s) detected."
+ asktype
fi