wancat/voidrice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

android mtp compatibility added to (u)mount scripts

Browse Source
This commit is contained in:
Luke Smith
2018-08-28 23:39:56 -04:00
parent 969070e01c
commit 4663df6576
2 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
.scripts/dmenumount
View File

@@ -4,20 +4,43 @@
# Otherwise, you'll be prompted to give a mountpoint from already existsing directories. # Otherwise, you'll be prompted to give a mountpoint from already existsing directories.
# If you input a novel directory, it will prompt you to create that directory. # If you input a novel directory, it will prompt you to create that directory.
pgrep -x dmenu && exit pgrep -x dmenu && exit
COLS="name,type,size,mountpoint"
drives="$(lsblk -rpo "$COLS" | awk '$2=="part"&&$4==""{printf "%s (%s)\n",$1,$3}')" getmount() { \
[ -z "$drives" ] && exit 1 [ -z "$chosen" ] && exit 1
chosen="$(echo "$drives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')" mp="$(find $1 2>/dev/null | dmenu -i -p "Type in mount point.")"
[ -z "$chosen" ] && exit 1 [ "$mp" = "" ] && exit 1
sudo -A mount "$chosen" && exit 0 if [ ! -d "$mp" ]; then
# You may want to change the line below for more suggestions for mounting. mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?")
# I.e. you can increase the depth of the search, or add directories. [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || sudo -A mkdir -p "$mp")
# This will increase the load time briefly though. fi
mp="$(find /mnt /media /mount /home -type d -maxdepth 5 2>/dev/null | dmenu -i -p "Type in mount point.")" }
[ "$mp" = "" ] && exit 1
if [ ! -d "$mp" ]; then mountusb() { \
mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?") drives="$(lsblk -rpo "name,type,size,mountpoint" | awk '$2=="part"&&$4==""{printf "%s (%s)\n",$1,$3}')"
[ "$mkdiryn" = "Yes" ] && sudo -A mkdir -p "$mp" 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)
getmount "$HOME -type d -maxdepth 3"
simple-mtpfs --device "$chosen" "$mp"
echo simple-mtpfs --device "$chosen" "$mp"
}
asktype() { \
case $(printf "USB\\nAndroid" | dmenu -i -p "Mount a USB drive or Android device?") in
USB) mountusb ;;
Android) mountandroid ;;
esac
}
if simple-mtpfs -l; then
asktype
else
mountusb
fi fi
sudo -A mount "$chosen" "$mp" && pgrep -x dunst && notify-send "$chosen mounted to $mp."

31
.scripts/dmenuumount
View File

@@ -3,8 +3,29 @@
# Provides you with mounted partitions, select one to unmount. # Provides you with mounted partitions, select one to unmount.
# Drives mounted at /, /boot and /home will not be options to unmount. # Drives mounted at /, /boot and /home will not be options to unmount.
drives=$(lsblk -nrpo "name,type,size,mountpoint" | awk '$2=="part"&&$4!~/\/boot|\/home$|SWAP/&&length($4)>1{printf "%s (%s) on %s\n",$1,$3,$4}') unmountusb() {
[ -z "$drives" ] && exit drives=$(lsblk -nrpo "name,type,size,mountpoint" | awk '$2=="part"&&$4!~/\/boot|\/home$|SWAP/&&length($4)>1{printf "%s (%s)\n",$4,$3}')
chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}') [ -z "$drives" ] && exit
[ -z "$chosen" ] && exit chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}')
sudo -A umount "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted." [ -z "$chosen" ] && exit
sudo -A umount "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted."
}
unmountandroid() { \
chosen=$(awk '/simple-mtpfs/ {print $2}' /etc/mtab | dmenu -i -p "Unmount which device?")
[ -z "$chosen" ] && exit
fusermount -u "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted."
}
asktype() { \
case $(printf "USB\\nAndroid" | dmenu -i -p "Unmount a USB drive or Android device?") in
USB) unmountusb ;;
Android) unmountandroid ;;
esac
}
if grep simple-mtpfs /etc/mtab; then
asktype
else
unmountusb && rmdiryn=$(printf "No\\nYes" | dmenu -i -p "Remove directory \`$chosen\`?") && [ "$rmdiryn" = "Yes" ] && (rmdir "$chosen" || sudo -A rmdir "$chosen")
fi