mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-17 16:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1686 from Anomalocaridid/nmount-replace-pmount

Browse source 
nmount: make `pmount` optional
This commit is contained in:
Arun 2023-07-16 00:20:50 +05:30 committed by GitHub
parent 53e4fec75b 80bbf76b5b
commit b835cfcc2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/README.md
View file

@ -45,7 +45,7 @@ Plugins extend the capabilities of `nnn`. They are _executable_ scripts (or bina
| [mp3conv](mp3conv) | Extract audio from multimedia as mp3 | sh | ffmpeg | | [mp3conv](mp3conv) | Extract audio from multimedia as mp3 | sh | ffmpeg |
| [mtpmount](mtpmount) | Toggle mount of MTP device (eg. Android) | sh | gvfs-mtp | | [mtpmount](mtpmount) | Toggle mount of MTP device (eg. Android) | sh | gvfs-mtp |
| [nbak](nbak) | Backs up `nnn` config | sh | tar, awk, mktemp | | [nbak](nbak) | Backs up `nnn` config | sh | tar, awk, mktemp |
| [nmount](nmount) | Toggle mount status of a device as normal user | sh | pmount, udisks2 | | [nmount](nmount) | Toggle mount status of a device as normal user | sh | pmount (optional), udisks2 |
| [nuke](nuke) | Sample file opener (CLI-only by default) | sh | _see in-file docs_ | | [nuke](nuke) | Sample file opener (CLI-only by default) | sh | _see in-file docs_ |
| [oldbigfile](oldbigfile) | List large files by access time | sh | find, sort | | [oldbigfile](oldbigfile) | List large files by access time | sh | find, sort |
| [openall](openall) | Open selected files together or one by one [✓] | bash | - | | [openall](openall) | Open selected files together or one by one [✓] | bash | - |

42
plugins/nmount
View file

@ -4,7 +4,7 @@
# If the device is not mounted, it will be mounted. # If the device is not mounted, it will be mounted.
# If the device is mounted, it will be unmounted and powered down. # If the device is mounted, it will be unmounted and powered down.
# #
# Dependencies: lsblk, pmount # Dependencies: lsblk, pmount (optional), udisks2
# #
# Usage: Runs `lsblk` on 'l', exits on 'Return`. # Usage: Runs `lsblk` on 'l', exits on 'Return`.
# #
@ -13,7 +13,7 @@
# macOS: "diskutil list" # macOS: "diskutil list"
# BSD: "geom disk list" # BSD: "geom disk list"
# - The script uses udisksctl (from udisks2) to power down devices. This is also Linux-specific. # - The script uses udisksctl (from udisks2) to power down devices. This is also Linux-specific.
# Users on non-Linux platforms can comment it and use an alterntive to power-down disks. # Users on non-Linux platforms can comment it and use an alternative to power-down disks.
# #
# Shell: POSIX compliant # Shell: POSIX compliant
# Author: Arun Prakash Jana # Author: Arun Prakash Jana
@ -32,16 +32,48 @@ while [ -n "$dev" ]; do
elif [ "$dev" = "q" ]; then elif [ "$dev" = "q" ]; then
exit exit
else else
if grep -qs "$dev " /proc/mounts; then # LUKS volumes mounted with udisksctl appear differently than with pmount
if grep -qs "$dev " /proc/mounts || [ -n "$(lsblk -n "/dev/$dev" -o MOUNTPOINT)" ]; then
sync "$(lsblk -n "/dev/$dev" -o MOUNTPOINT | sed "/^$/d")" sync "$(lsblk -n "/dev/$dev" -o MOUNTPOINT | sed "/^$/d")"
if pumount "/dev/$dev"; then if type pumount >/dev/null 2>&1; then
pumount "/dev/$dev"
exit_code="$?"
else
# Unlike pmount, udisksctl does not transparently handle LUKS volumes
# We need to manually get the unlocked device, unmount it, and then lock the volume
if lsblk -n "/dev/$dev" -o FSTYPE | grep "crypto_LUKS" >/dev/null; then
dev_map="$(udisksctl info -b /dev/"$dev" | grep "CleartextDevice" | grep -o "dm_2d[[:digit:]]*" | sed "s/_2d/-/")"
udisksctl unmount -b "/dev/$dev_map" --no-user-interaction >/dev/null
exit_code="$?"
udisksctl lock -b "/dev/$dev" --no-user-interaction >/dev/null
else
udisksctl unmount -b "/dev/$dev" --no-user-interaction >/dev/null
exit_code="$?"
fi
fi
if [ $exit_code -eq 0 ]; then
echo "/dev/$dev unmounted." echo "/dev/$dev unmounted."
if udisksctl power-off -b "/dev/$dev" --no-user-interaction; then if udisksctl power-off -b "/dev/$dev" --no-user-interaction; then
echo "/dev/$dev ejected." echo "/dev/$dev ejected."
fi fi
fi fi
elif [ -b "/dev/$dev" ]; then elif [ -b "/dev/$dev" ]; then
if pmount "/dev/$dev"; then if type pmount >/dev/null 2>&1; then
pmount "/dev/$dev"
exit_code="$?"
else
# Unlike pmount, udisksctl does not transparently handle LUKS volumes
# We need to manually get the unlocked device and mount that instead of the volume itself
if [ "$(lsblk "/dev/$dev" -n -o FSTYPE)" = "crypto_LUKS" ]; then
dev_map=$(udisksctl unlock -b "/dev/$dev" --no-user-interaction | grep -o "dm-[[:digit:]]*")
udisksctl mount -b "/dev/$dev_map" --no-user-interaction >/dev/null
exit_code="$?"
else
udisksctl mount -b "/dev/$dev" --no-user-interaction >/dev/null
exit_code="$?"
fi
fi
if [ $exit_code -eq 0 ]; then
sleep 1 sleep 1
echo "/dev/$dev mounted to $(lsblk -n "/dev/$dev" -o MOUNTPOINT | sed "/^$/d")." echo "/dev/$dev mounted to $(lsblk -n "/dev/$dev" -o MOUNTPOINT | sed "/^$/d")."
fi fi