diff options
| author | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2022-09-20 00:33:13 +0200 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2022-09-20 00:33:13 +0200 |
| commit | a7340387b8a0ebbedf975d4136d31e03606a399a (patch) | |
| tree | 81bdac7365988b523dadaa818bec197b54205d96 | |
| parent | 0e08e39f269d7ec1ead5441a2d749d746098af63 (diff) | |
Update (un)mount usbs with doas
| -rwxr-xr-x | .local/bin/dmenumount | 10 | ||||
| -rwxr-xr-x | .local/bin/dmenuunmount | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.local/bin/dmenumount b/.local/bin/dmenumount index 7de8488..7314374 100755 --- a/.local/bin/dmenumount +++ b/.local/bin/dmenumount @@ -12,21 +12,21 @@ getmount() { \ test -z "$mp" && exit 1 if [ ! -d "$mp" ]; then mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?") || exit 1 - [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || sudo -A mkdir -p "$mp") + [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || doas mkdir -p "$mp") fi } mountusb() { \ chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?")" || exit 1 chosen="$(echo "$chosen" | awk '{print $1}')" - sudo -A mount "$chosen" 2>/dev/null && notify-send "💻 USB mounting" "$chosen mounted." && exit 0 + doas -A mount "$chosen" 2>/dev/null && notify-send "💻 USB mounting" "$chosen mounted." && exit 0 alreadymounted=$(lsblk -nrpo "name,type,mountpoint" | awk '$3!~/\/boot|\/home$|SWAP/&&length($3)>1{printf "-not ( -path *%s -prune ) ",$3}') getmount "/mnt /media /mount /home -maxdepth 5 -type d $alreadymounted" partitiontype="$(lsblk -no "fstype" "$chosen")" case "$partitiontype" in - "vfat") sudo -A mount -t vfat "$chosen" "$mp" -o rw,umask=0000;; - "exfat") sudo -A mount "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)";; - *) sudo -A mount "$chosen" "$mp"; user="$(whoami)"; ug="$(groups | awk '{print $1}')"; sudo -A chown "$user":"$ug" "$mp";; + "vfat") doas mount -t vfat "$chosen" "$mp" -o rw,umask=0000;; + "exfat") doas mount "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)";; + *) doas mount "$chosen" "$mp"; user="$(whoami)"; ug="$(groups | awk '{print $1}')"; doas chown "$user":"$ug" "$mp";; esac notify-send "💻 USB mounting" "$chosen mounted to $mp." } diff --git a/.local/bin/dmenuunmount b/.local/bin/dmenuunmount index 5006358..9018419 100755 --- a/.local/bin/dmenuunmount +++ b/.local/bin/dmenuunmount @@ -9,7 +9,7 @@ unmountusb() { chosen="$(echo "$drives" | dmenu -i -p "Unmount which drive?")" || exit 1 chosen="$(echo "$chosen" | awk '{print $1}')" [ -z "$chosen" ] && exit - sudo -A umount "$chosen" && notify-send "💻 USB unmounting" "$chosen unmounted." + doas umount "$chosen" && notify-send "💻 USB unmounting" "$chosen unmounted." } 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}') |