From 1f3ce3ae941190d6664222ef8b544468e0261bbd Mon Sep 17 00:00:00 2001 From: KlzXS Date: Thu, 4 Jun 2020 14:51:50 +0000 Subject: [PATCH] Added selection prompt and README entry (#633) --- plugins/README.md | 2 ++ plugins/gpgd | 11 +++++++++-- plugins/gpge | 16 ++++++++++++---- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/plugins/README.md b/plugins/README.md index dc95d96d..e4f24916 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -40,6 +40,8 @@ Plugins are installed to `${XDG_CONFIG_HOME:-$HOME/.config}/nnn/plugins`. | fzz | Change to any directory in the z database with fzf | sh | fzf, z | | getplugs | Update plugins to installed `nnn` version | sh | curl | | gutenread | Browse, download, read from Project Gutenberg | sh | curl, unzip, w3m
[epr](https://github.com/wustho/epr) (optional) | +| gpgd | Decrypt files using gpg | sh | gpg | +| gpge | Encrypt files using gpg | sh | gpg, fzf (see in-file docs) | | hexview | View a file in hex in `$PAGER` | sh | xxd | | imgresize | Resize images in dir to screen resolution | sh | [imgp](https://github.com/jarun/imgp) | | imgthumb | View thumbnail of an image or dir of images | sh | [lsix](https://github.com/hackerb9/lsix) | diff --git a/plugins/gpgd b/plugins/gpgd index 0fd3c8d4..0dde5886 100755 --- a/plugins/gpgd +++ b/plugins/gpgd @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # Description: Decrypts selected files using gpg. The contents of the decrypted file are stored in a file with extension .dec # @@ -9,7 +9,14 @@ selection=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection} -files=$(tr '\0' '\n' < "$selection") +printf "(s)election/(c)urrent? [default=c] " +read -r resp + +if [ "$resp" = "s" ]; then + files=$(tr '\0' '\n' < "$selection") +else + files=$1 +fi printf "%s" "$files" | xargs -n1 -I{} gpg --decrypt --output "{}.dec" {} diff --git a/plugins/gpge b/plugins/gpge index 5f7b33dc..e69e1167 100755 --- a/plugins/gpge +++ b/plugins/gpge @@ -1,9 +1,9 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # Description: Encrypts selected files using gpg. Can encrypt either asymmetrically (key) or symmetrically (passphrase). # If asymmetric encryption is chosen a key can be chosen from the list of capable public keys using fzf. # -# Note: symmetric encryption only works for a single file as per gpg limitations +# Note: symmetric encryption only works for a single (current) file as per gpg limitations # # Shell: POSIX compliant # Author: KlzXS @@ -13,10 +13,18 @@ selection=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection} printf "(s)ymmetric, (a)symmetric? [default=a] " read -r symmetry -files=$(tr '\0' '\n' < "$selection") if [ "$symmetry" = "s" ]; then - gpg --symmetric "$files" + gpg --symmetric "$1" else + printf "(s)election/(c)urrent? [default=c] " + read -r resp + + if [ "$resp" = "s" ]; then + files=$(tr '\0' '\n' < "$selection") + else + files=$1 + fi + keyids=$(gpg --list-public-keys --with-colons | grep -E "pub:(.*:){10}.*[eE].*:" | awk -F ":" '{print $5}') #awk needs literal $10