commit b295c55d8ff84312c9307ff5aec862429b97ec8f
parent 373558c1b4c2e8035f3869242fdcad2d460354e4
Author: awy <awy@awy.one>
Date: Thu, 20 Mar 2025 15:14:20 +0300
update
Diffstat:
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.local/bin/mounter b/.local/bin/mounter
@@ -1,7 +1,7 @@
#!/bin/bash
# Mounts Android Phones and USB drives (encrypted or not). This script will
-# replace the older `dmenumount` which had extra steps and couldn't handle
+# replace the older `wmenumount` which had extra steps and couldn't handle
# encrypted drives.
# TODO: Try decrypt for drives in crtypttab
# TODO: Add some support for connecting iPhones (although they are annoying).
@@ -29,7 +29,7 @@ lsblkoutput="$(lsblk -rpo "uuid,name,type,size,label,mountpoint,fstype")"
allluks="$(echo "$lsblkoutput" | grep crypto_LUKS)"
# Get a list of the LUKS drive UUIDs already decrypted.
decrypted="$(find /dev/disk/by-id/dm-uuid-CRYPT-LUKS2-* | sed "s|.*LUKS2-||;s|-.*||")"
-# Functioning for formatting drives correctly for bemenu:
+# Functioning for formatting drives correctly for wmenu:
filter() { sed "s/ /:/g" | awk -F':' '$7==""{printf "%s%s (%s) %s\n",$1,$3,$5,$6}' ; }
# Get only LUKS drives that are not decrypted.
@@ -55,22 +55,22 @@ set -e
test -n "$alldrives"
-# Feed all found drives to bemenu and get user choice.
-chosen="$(echo "$alldrives" | bemenu -p "Mount which drive?" -i)"
+# Feed all found drives to wmenu and get user choice.
+chosen="$(echo "$alldrives" | wmenu -N 2e3440 -n d8dee9 -S eacb8a -s 3b4252 -M eacb8a -m 3b4252 -f "monospace 12" -p "Mount which drive?" -i)"
# Function for prompting user for a mountpoint.
getmount(){
- mp="$(find /mnt /media /mount /home -maxdepth 1 -type d 2>/dev/null | bemenu -i -p "Mount this drive where?")"
+ mp="$(find /mnt /media /mount /home -maxdepth 1 -type d 2>/dev/null | wmenu -N 2e3440 -n d8dee9 -S eacb8a -s 3b4252 -M eacb8a -m 3b4252 -f "monospace 12" -i -p "Mount this drive where?")"
test -n "$mp"
if [ ! -d "$mp" ]; then
- mkdiryn=$(printf "No\\nYes" | bemenu -i -p "$mp does not exist. Create it?")
- [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || doas mkdir -p "$mp")
+ mkdiryn=$(printf "No\\nYes" | wmenu -N 2e3440 -n d8dee9 -S eacb8a -s 3b4252 -M eacb8a -m 3b4252 -f "monospace 12" -i -p "$mp does not exist. Create it?")
+ [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || sudo -A mkdir -p "$mp")
fi
}
attemptmount(){
# Attempt to mount without a mountpoint, to see if drive is in fstab.
- doas mount "$chosen" || return 1
+ sudo -A mount "$chosen" || return 1
notify-send "💾Drive Mounted." "$chosen mounted."
exit
}
@@ -82,9 +82,9 @@ case "$chosen" in
parttype="$(echo "$lsblkoutput" | grep "$chosen")"
attemptmount || getmount
case "${parttype##* }" in
- vfat) doas mount -t vfat "$chosen" "$mp" -o rw,umask=0000 ;;
- btrfs) doas mount "$chosen" "$mp" ;;
- *) doas mount "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)" ;;
+ vfat) sudo -A mount -t vfat "$chosen" "$mp" -o rw,umask=0000 ;;
+ btrfs) sudo -A mount "$chosen" "$mp" ;;
+ *) sudo -A mount "$chosen" "$mp" -o uid="$(id -u)",gid="$(id -g)" ;;
esac
notify-send "💾Drive Mounted." "$chosen mounted to $mp."
;;
@@ -99,12 +99,12 @@ case "$chosen" in
done
# Decrypt in a terminal window
- ${TERMINAL:-st} -n floatterm -g 60x1 -e doas cryptsetup open "$chosen" "usb$num"
+ ${TERMINAL:-st} -n floatterm -g 60x1 -e sudo cryptsetup open "$chosen" "usb$num"
# Check if now decrypted.
test -b "/dev/mapper/usb$num"
attemptmount || getmount
- doas mount "/dev/mapper/usb$num" "$mp" -o uid="$(id -u)",gid="$(id -g)"
+ sudo -A mount "/dev/mapper/usb$num" "$mp" -o uid="$(id -u)",gid="$(id -g)"
notify-send "🔓Decrypted drive Mounted." "$chosen decrypted and mounted to $mp."
;;
@@ -113,7 +113,7 @@ case "$chosen" in
getmount
number="${chosen%%:*}"
number="${chosen:1}" # This is a bashism.
- doas simple-mtpfs -o allow_other -o fsname="simple-mtpfs-$(escape "$chosen")" --device "$number" "$mp"
+ sudo -A simple-mtpfs -o allow_other -o fsname="simple-mtpfs-$(escape "$chosen")" --device "$number" "$mp"
notify-send "🤖 Android Mounted." "Android device mounted to $mp."
;;
esac
diff --git a/.local/bin/unmounter b/.local/bin/unmounter
@@ -1,6 +1,6 @@
#!/bin/sh
-# Unmount USB drives or Android phones. Replaces the older `dmenuumount`. Fewer
+# Unmount USB drives or Android phones. Replaces the older `wmenuumount`. Fewer
# prompt and also de-decrypts LUKS drives that are unmounted.
set -e
@@ -13,16 +13,16 @@ allunmountable="$(echo "$mounteddroids
$mounteddrives" | sed "/^$/d;s/ *$//")"
test -n "$allunmountable"
-chosen="$(echo "$allunmountable" | bemenu -i -p "Unmount which drive?")"
+chosen="$(echo "$allunmountable" | wmenu -N 2e3440 -n d8dee9 -S eacb8a -s 3b4252 -M eacb8a -m 3b4252 -f "monospace 12" -i -p "Unmount which drive?")"
chosen="${chosen%% *}"
test -n "$chosen"
-doas umount -l "/${chosen#*/}"
+sudo -A umount -l "/${chosen#*/}"
notify-send "Device unmounted." "$chosen has been unmounted."
# Close the chosen drive if decrypted.
cryptid="$(echo "$lsblkoutput" | grep "/${chosen#*/}$")"
cryptid="${cryptid%% *}"
test -b /dev/mapper/"${cryptid##*/}"
-doas cryptsetup close "$cryptid"
+sudo -A cryptsetup close "$cryptid"
notify-send "🔒Device dencryption closed." "Drive is now securely locked again."
