diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2018-11-01 14:20:03 -0400 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2018-11-01 14:20:03 -0400 |
| commit | da0f5054d6e37feb22c7185566420f0a492fb6c8 (patch) | |
| tree | 6c5613e648e4da0d359a58a626898daf8fec2a5d | |
| parent | 2572ae89d831fe21e5121c6aa19b293992d2df5a (diff) | |
| download | eibhear-da0f5054d6e37feb22c7185566420f0a492fb6c8.tar.gz eibhear-da0f5054d6e37feb22c7185566420f0a492fb6c8.tar.zst eibhear-da0f5054d6e37feb22c7185566420f0a492fb6c8.zip | |
dmenumount fix and output changes
| -rwxr-xr-x | .scripts/dmenumount | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/.scripts/dmenumount b/.scripts/dmenumount index 17f0eb2..cdeca18 100755 --- 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 | 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?") @@ -18,13 +18,13 @@ getmount() { \ mountusb() { \ chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')" 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." } mountandroid() { \ 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" 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 [ -z "$anddrives" ] && echo "No USB drive or Android device detected" && exit - echo "Android device detected." + echo "Android device(s) detected." mountandroid else - echo "USB drive(s) detected." if [ -z "$anddrives" ]; then - echo "USB drive detected." + echo "USB drive(s) detected." mountusb else echo "Mountable USB drive(s) and Android device(s) detected." |