From d8a759b0bb0e510e1ea037a3f10e42a61fc4e618 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Mon, 15 May 2023 00:17:12 +0200 Subject: Fix ext drive mounters --- .local/bin/dmenumount | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100755 .local/bin/dmenumount (limited to '.local/bin/dmenumount') diff --git a/.local/bin/dmenumount b/.local/bin/dmenumount deleted file mode 100755 index 7314374..0000000 --- a/.local/bin/dmenumount +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# Gives a dmenu prompt to mount unmounted drives and Android phones. If -# they're in /etc/fstab, they'll be mounted automatically. Otherwise, you'll -# be prompted to give a mountpoint from already existsing directories. If you -# input a novel directory, it will prompt you to create that directory. - -getmount() { \ - [ -z "$chosen" ] && exit 1 - # shellcheck disable=SC2086 - mp="$(find $1 2>/dev/null | dmenu -i -p "Type in mount point.")" || exit 1 - 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" || doas mkdir -p "$mp") - fi - } - -mountusb() { \ - chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?")" || exit 1 - chosen="$(echo "$chosen" | awk '{print $1}')" - 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") 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." - } - -usbdrives="$(lsblk -rpo "name,type,size,label,mountpoint,fstype" | grep -v crypto_LUKS | grep 'part\|rom' | sed 's/ /:/g' | awk -F':' '$5==""{printf "%s (%s) %s\n",$1,$3,$4}')" - -if [ -z "$usbdrives" ]; then - echo "No USB drive detected" && exit -else - echo "USB drive(s) detected." - mountusb -fi -- cgit v1.2.3-70-g09d2