dotfiles

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 496aea4504c70fe165faf90db0bf1d95efa00caf
parent 39a0c9c5fa7b744c6cfea4f8dd1073dc6dfc63d7
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Thu, 18 Oct 2018 20:42:44 -0400

minor dmenuumount improvements

Diffstat:
M.scripts/dmenuumount | 13+++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.scripts/dmenuumount b/.scripts/dmenuumount @@ -4,7 +4,6 @@ # Drives mounted at /, /boot and /home will not be options to unmount. unmountusb() { - drives=$(lsblk -nrpo "name,type,size,mountpoint" | awk '$2=="part"&&$4!~/\/boot|\/home$|SWAP/&&length($4)>1{printf "%s (%s)\n",$4,$3}') [ -z "$drives" ] && exit chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}') [ -z "$chosen" ] && exit @@ -24,8 +23,14 @@ asktype() { \ esac } -if grep simple-mtpfs /etc/mtab; then - asktype -else +drives=$(lsblk -nrpo "name,type,size,mountpoint" | awk '$2=="part"&&$4!~/\/boot|\/home$|SWAP/&&length($4)>1{printf "%s (%s)\n",$4,$3}') + +if ! grep simple-mtpfs /etc/mtab; then + [ -z "$drives" ] && echo "No drives to unmount." && exit + echo "Unmountable USB drive detected." unmountusb +else + [ -z "$drives" ] && echo "Unmountable Android device detected." && unmountandroid + echo "Unmountable USB drive(s) and Android device(s) detected." + asktype fi