NapoleonDynamite/voidrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dmenumount fix and output changes

Browse source
This commit is contained in:
Luke Smith 2018-11-01 14:20:03 -04:00
parent 2572ae89d8
commit da0f5054d6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.scripts/dmenumount
View file

@ -7,7 +7,7 @@ pgrep -x dmenu && exit
getmount() { \ getmount() { \
[ -z "$chosen" ] && exit 1 [ -z "$chosen" ] && exit 1
mp="$(find "$1" 2>/dev/null | dmenu -i -p "Type in mount point.")" mp="$(find $1 | dmenu -i -p "Type in mount point.")"
[ "$mp" = "" ] && exit 1 [ "$mp" = "" ] && exit 1
if [ ! -d "$mp" ]; then if [ ! -d "$mp" ]; then
mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?") mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?")
@ -18,13 +18,13 @@ 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 '{print $1}')"
sudo -A mount "$chosen" && exit 0 sudo -A mount "$chosen" && exit 0
getmount "/mnt /media /mount /home -type d -maxdepth 5" 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."
} }
mountandroid() { \ mountandroid() { \
chosen=$(echo "$anddrives" | 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" getmount "$HOME -maxdepth 3 -type d"
simple-mtpfs --device "$chosen" "$mp" simple-mtpfs --device "$chosen" "$mp"
echo simple-mtpfs --device "$chosen" "$mp" echo simple-mtpfs --device "$chosen" "$mp"
} }
@ -41,12 +41,11 @@ usbdrives="$(lsblk -rpo "name,type,size,mountpoint" | awk '$2=="part"&&$4==""{pr
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 detected." echo "Android device(s) detected."
mountandroid mountandroid
else else
echo "USB drive(s) detected."
if [ -z "$anddrives" ]; then if [ -z "$anddrives" ]; then
echo "USB drive detected." echo "USB drive(s) detected."
mountusb mountusb
else else
echo "Mountable USB drive(s) and Android device(s) detected." echo "Mountable USB drive(s) and Android device(s) detected."