summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzachir <zachir@librem.one>2023-10-19 17:48:53 -0500
committerzachir <zachir@librem.one>2023-10-19 17:48:53 -0500
commit8b8ed9340c074c228df8fc284e0bf24c47efdecc (patch)
tree4ed9b6e943026086f2c7c0494cbf757c7faeaa06
parent6e72884bb5d0d046b37df86aedad33f0f60557f3 (diff)
Replace 'doas' with 'sudo'
It's just simpler to use sudo than doas. Not because the program is easier (it isn't), but because I'm using Linux, and Linux generally expects sudo.
-rwxr-xr-xdmenumount10
-rwxr-xr-xdmenuumount4
2 files changed, 7 insertions, 7 deletions
diff --git a/dmenumount b/dmenumount
index 179781d..7988c5c 100755
--- a/dmenumount
+++ b/dmenumount
@@ -32,7 +32,7 @@ getmount() { \
test -z "$mp" && exit 1
if [ ! -d "$mp" ]; then
mkdiryn=$(printf "No\\nYes" | $DMENU $DEFARGS "$mp does not exist. Create it?" $ARGS) || exit 1
- [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || doas mkdir -p "$mp")
+ [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || sudo mkdir -p "$mp")
fi
}
@@ -40,14 +40,14 @@ mountusb() { \
chosen="$(echo "$usbdrives" | $DMENU $DEFARGS "Mount which drive?" $ARGS)" || exit 1
chosen="$(echo "$chosen" | awk '{print $1}')"
echo "$chosen"
- doas mount "$chosen" 2>/dev/null && notify-send "💻 USB mounting" "$chosen mounted." && exit 0
+ sudo 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 3 -type d -empty $alreadymounted"
partitiontype="$(lsblk -no "fstype" "$chosen")"
case "$partitiontype" in
- "vfat") doas mount -t vfat "$chosen" "$mp" -o rw,umask=0000;;
- "exfat") doas mount.exfat "$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";;
+ "vfat") sudo mount -t vfat "$chosen" "$mp" -o rw,umask=0000;;
+ "exfat") sudo mount.exfat "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)";;
+ *) sudo mount "$chosen" "$mp"; user="$(whoami)"; ug="$(groups | awk '{print $1}')"; sudo chown "$user":"$ug" "$mp";;
esac
notify-send "💻 USB mounting" "$chosen mounted to $mp."
}
diff --git a/dmenuumount b/dmenuumount
index 4af0394..6dc25e2 100755
--- a/dmenuumount
+++ b/dmenuumount
@@ -29,13 +29,13 @@ unmountusb() {
chosen="$(echo "$drives" | $DMENU $DEFARGS "Unmount which drive?" $ARGS)" || exit 1
chosen="$(echo "$chosen" | awk '{print $1}')"
[ -z "$chosen" ] && exit
- doas umount "$chosen" && notify-send "💻 USB unmounting" "$chosen unmounted."
+ sudo umount "$chosen" && notify-send "💻 USB unmounting" "$chosen unmounted."
}
unmountandroid() { \
chosen="$(awk '/simple-mtpfs/ {print $2}' /etc/mtab | $DMENU $DEFARGS "Unmount which device?" $ARGS )" || exit 1
[ -z "$chosen" ] && exit
- doas umount -l "$chosen" && notify-send "🤖 Android unmounting" "$chosen unmounted."
+ sudo umount -l "$chosen" && notify-send "🤖 Android unmounting" "$chosen unmounted."
}
asktype() { \