diff options
Diffstat (limited to 'mounter.sh')
-rwxr-xr-x | mounter.sh | 21 |
1 files changed, 9 insertions, 12 deletions
@@ -13,8 +13,8 @@ CHOICE=$(lsblk --json -o LABEL,PATH,SIZE,FSTYPE,TYPE,PARTLABEL,MOUNTPOINT | .label!="partestroot" and .label!="debian-root" and .label!="partestboot" and - .partlabel!="EFI" and .partlabel!="boot" and + .partlabel!="EFI" and .partlabel!="arch-root-amd64" and .partlabel!="EFI system partition" and .partlabel!="McAfeeEpeReserved" and @@ -32,17 +32,14 @@ printf "DEV: %s\n" "$DEV" LABEL=$(lsblk -n -oLABEL $DEV) [ -z "$LABEL" ] && LABEL=$(lsblk -n -oUUID $DEV) FSTYPE=$(lsblk -n -oFSTYPE $DEV) -[ "$FSTYPE" = "vfat" ] && { - mountargs="-t vfat -oiocharset=utf8,uid=$(id -u)" -} +case $FSTYPE in + 'vfat'|'exfat'|'ntfs') + mountargs="uid=$(id -u)" + ;; + *) + ;; +esac MDIR=$HOME/media/$LABEL mkdir $MDIR 2>/dev/null -doas /usr/bin/mount $mountargs $DEV $MDIR +doas /usr/bin/mount -o $mountargs $DEV $MDIR notify-send -t 4000 "$?" -#cmd="doas /usr/bin/mount $DEV $MDIR 2>&1" -#cmd="udisksctl mount -b $DEV 2>&1" -#printf "cmd: %s\n" "$cmd" -#msg="$($cmd)" -#notify-send -t 4000 "$msg" -#msg="$(lsusb -tv|grep -E 'uas|usb-storage' -A1)" -#notify-send -t 4000 "$msg" |