dotfiles-x111463ae7
removed android stuff from dmenumount\umount scripts
+10 −55
3 files changed
- M .config/ncmpcpp/config +3 −0
- M .local/bin/dmenumount +3 −29
- M .local/bin/dmenuumount +4 −26
| @@ -32,6 +32,9 @@ statusbar_color = red | |||
| 32 | 32 | volume_color = "green" | |
| 33 | 33 | statusbar_time_color = cyan:b | |
| 34 | 34 | ||
| 35 | + | ## Selected tracks ## | |
| 36 | + | selected_item_prefix = "* " | |
| 37 | + | ||
| 35 | 38 | ## Seeking ## | |
| 36 | 39 | incremental_seeking = "yes" | |
| 37 | 40 | seek_time = "1" | |
| @@ -1,6 +1,6 @@ | |||
| 1 | 1 | #!/bin/sh | |
| 2 | 2 | ||
| 3 | − | # Gives a dmenu prompt to mount unmounted drives and Android phones. If | |
| 3 | + | # Gives a dmenu prompt to mount unmounted drives. If | |
| 4 | 4 | # they're in /etc/fstab, they'll be mounted automatically. Otherwise, you'll | |
| 5 | 5 | # be prompted to give a mountpoint from already existsing directories. If you | |
| 6 | 6 | # input a novel directory, it will prompt you to create that directory. | |
| @@ -31,37 +31,11 @@ mountusb() { \ | |||
| 31 | 31 | notify-send "💻 USB mounting" "$chosen mounted to $mp." | |
| 32 | 32 | } | |
| 33 | 33 | ||
| 34 | − | mountandroid() { \ | |
| 35 | − | chosen="$(echo "$anddrives" | dmenu -i -p "Which Android device?")" || exit 1 | |
| 36 | − | chosen="$(echo "$chosen" | cut -d : -f 1)" | |
| 37 | − | getmount "$HOME -maxdepth 3 -type d" | |
| 38 | − | simple-mtpfs --device "$chosen" "$mp" | |
| 39 | − | echo "OK" | dmenu -i -p "Tap Allow on your phone if it asks for permission and then press enter" || exit 1 | |
| 40 | − | simple-mtpfs --device "$chosen" "$mp" | |
| 41 | − | notify-send "🤖 Android Mounting" "Android device mounted to $mp." | |
| 42 | − | } | |
| 43 | − | ||
| 44 | − | asktype() { \ | |
| 45 | − | choice="$(printf "USB\\nAndroid" | dmenu -i -p "Mount a USB drive or Android device?")" || exit 1 | |
| 46 | − | case $choice in | |
| 47 | − | USB) mountusb ;; | |
| 48 | − | Android) mountandroid ;; | |
| 49 | − | esac | |
| 50 | − | } | |
| 51 | − | ||
| 52 | − | anddrives=$(simple-mtpfs -l 2>/dev/null) | |
| 53 | 34 | usbdrives="$(lsblk -rpo "name,type,size,mountpoint" | grep 'part\|rom' | awk '$4==""{printf "%s (%s)\n",$1,$3}')" | |
| 54 | 35 | ||
| 55 | 36 | if [ -z "$usbdrives" ]; then | |
| 56 | − | [ -z "$anddrives" ] && echo "No USB drive or Android device detected" && exit | |
| 57 | − | echo "Android device(s) detected." | |
| 58 | − | mountandroid | |
| 37 | + | echo "No USB drive detected" && exit | |
| 59 | 38 | else | |
| 60 | − | if [ -z "$anddrives" ]; then | |
| 61 | 39 | echo "USB drive(s) detected." | |
| 62 | 40 | mountusb | |
| 63 | − | else | |
| 64 | − | echo "Mountable USB drive(s) and Android device(s) detected." | |
| 65 | − | asktype | |
| 66 | − | fi | |
| 67 | − | fi | |
| 41 | + | fi | |
| @@ -12,33 +12,11 @@ unmountusb() { | |||
| 12 | 12 | sudo -A umount "$chosen" && notify-send "💻 USB unmounting" "$chosen unmounted." | |
| 13 | 13 | } | |
| 14 | 14 | ||
| 15 | − | unmountandroid() { \ | |
| 16 | − | chosen="$(awk '/simple-mtpfs/ {print $2}' /etc/mtab | dmenu -i -p "Unmount which device?")" || exit 1 | |
| 17 | − | [ -z "$chosen" ] && exit | |
| 18 | − | sudo -A umount -l "$chosen" && notify-send "🤖 Android unmounting" "$chosen unmounted." | |
| 19 | − | } | |
| 20 | − | ||
| 21 | − | asktype() { \ | |
| 22 | − | choice="$(printf "USB\\nAndroid" | dmenu -i -p "Unmount a USB drive or Android device?")" || exit 1 | |
| 23 | − | case "$choice" in | |
| 24 | − | USB) unmountusb ;; | |
| 25 | − | Android) unmountandroid ;; | |
| 26 | − | esac | |
| 27 | − | } | |
| 28 | − | ||
| 29 | 15 | drives=$(lsblk -nrpo "name,type,size,mountpoint,label" | awk -F':' '{gsub(/ /,":")}$4!~/\/boot|\/efi|\/home$|SWAP/&&length($4)>1{printf "%s (%s) %s\n",$4,$3,$5}') | |
| 30 | 16 | ||
| 31 | − | if ! grep simple-mtpfs /etc/mtab; then | |
| 32 | − | [ -z "$drives" ] && echo "No drives to unmount." && exit | |
| 33 | − | echo "Unmountable USB drive detected." | |
| 34 | − | unmountusb | |
| 17 | + | if [ -z "$drives" ]; then | |
| 18 | + | echo "No drives to unmount." && exit | |
| 35 | 19 | else | |
| 36 | − | if [ -z "$drives" ] | |
| 37 | − | then | |
| 38 | − | echo "Unmountable Android device detected." | |
| 39 | − | unmountandroid | |
| 40 | − | else | |
| 41 | − | echo "Unmountable USB drive(s) and Android device(s) detected." | |
| 42 | − | asktype | |
| 43 | − | fi | |
| 20 | + | echo "Unmountable USB drive detected." | |
| 21 | + | unmountusb | |
| 44 | 22 | fi | |