swytch/dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

cleanup: format dmenumount and dmenuumount

Browse Source
This commit is contained in:
David 2020-09-03 21:00:08 +02:00
parent cbc1e70790
commit fbe75ff435
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.local/bin/dmenumount
View File

@ -22,12 +22,14 @@ 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}')"
alreadymounted=$(lsblk -nrpo "name,type,mountpoint" | awk '$2=="part"&&$3!~/\/boot|\/home$|SWAP/&&length($3)>1{printf "-not \\( -path *%s -prune \\) \\ \n",$3}') alreadymounted=$(lsblk -nrpo "name,type,mountpoint" \
getmount "/mnt /media /mount /home -maxdepth 5 -type d $alreadymounted" | awk '$2=="part"&&$3!~/\/efi|\/home$|SWAP/&&length($3)>1\{printf "-not \\( -path *%s -prune \\) \\ \n",$3}')
getmount "/mnt /media /mount /home -maxdepth 2 -type d $alreadymounted"
partitiontype="$(lsblk -no "fstype" "$chosen")" partitiontype="$(lsblk -no "fstype" "$chosen")"
case "$partitiontype" in case "$partitiontype" in
"vfat") sudo -A mount -t vfat "$chosen" "$mp" -o rw,umask=0000;; "vfat") sudo -A mount -t vfat "$chosen" "$mp" -o rw,umask=0000;;
*) sudo -A mount "$chosen" "$mp"; user="$(whoami)"; ug="$(groups | awk '{print $1}')"; sudo -A chown "$user":"$ug" "$mp";; *) sudo -A mount "$chosen" "$mp"; user="$(whoami)";
ug="$(groups | awk '{print $1}')"; sudo -A chown "$user":"$ug" "$mp";;
esac esac
notify-send "禍 USB mounting" "$chosen mounted to $mp." notify-send "禍 USB mounting" "$chosen mounted to $mp."
} }

3
.local/bin/dmenuumount
View File

@ -23,7 +23,8 @@ else
fi fi
} }
usbdrives=$(lsblk -nrpo "name,type,size,mountpoint" | awk '$2=="part"&&$4!~/\/boot|\/home$|SWAP/&&length($4)>1{printf "%s (%s)\n",$4,$3}') usbdrives=$(lsblk -nrpo "name,type,size,mountpoint" | awk \
'$2=="part"&&$4!~/\/efi|\/home$|SWAP/&&length($4)>1{printf "%s (%s)\n",$4,$3}')
if [ -z "$usbdrives" ]; then if [ -z "$usbdrives" ]; then
notify-send -u "critical" -t 3000 "禍 USB ERROR" "No drive to unmount." notify-send -u "critical" -t 3000 "禍 USB ERROR" "No drive to unmount."