wrap editor in script

diff --git a/.bin/genpw-editor b/.bin/genpw-editor
new file mode 100755 (executable)
index 0000000..108f1b6
--- /dev/null
+++ b/.bin/genpw-editor
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -eu
+
+if command -v diceware >/dev/null; then
+  PW_GENERATOR='diceware -s2'
+
+elif command -v pwgen >/dev/null; then
+  PW_GENERATOR='pwgen -y 20 1'
+
+else
+  PW_GENERATOR='dd if=/dev/random bs=256 count=1 | base64'
+
+fi
+
+exec vim -c 'set noshelltemp' -c "0read! $PW_GENERATOR" -c 2d -n

diff --git a/.gitignore.d/pass b/.gitignore.d/pass
index 8b3844c1efa5d2857a6167cee2290d6abbf5611c..61a21a140e08853ebe8190285850e0c3fe80f197 100644 (file)
--- a/.gitignore.d/pass
+++ b/.gitignore.d/pass
@@ -1,4 +1,5 @@
 *
 *

+!/.bin/genpw-editor

 !/.gitignore.d/pass
 !/.zsh/aliases/genpw
 !/.zsh/aliases/getpw
 !/.gitignore.d/pass
 !/.zsh/aliases/genpw
 !/.zsh/aliases/getpw

diff --git a/.zsh/aliases/genpw b/.zsh/aliases/genpw
index 7b9f99777454ce7252a53ca02d91b09b3308721b..c49760298902e3178f600757d311dc623b60f3bb 100644 (file)
--- a/.zsh/aliases/genpw
+++ b/.zsh/aliases/genpw
@@ -1 +1 @@
-() { EDITOR="vim -c 'set noshelltemp' -c '0read! diceware -s ${2:-1}' -c 2d -n" pass edit "$1"; }
+() { EDITOR="genpw-editor $2" pass edit "$1"; }