summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-05-05 19:31:56 -0400
committerAndrew Cady <d@jerkface.net>2020-05-05 19:31:56 -0400
commitd91e09564b72cddd9d74ccb6fc43d15a9f38286b (patch)
tree80ad60636c349ff31840992ab003b975e9ee5fa1
parent0163371aeead1b3fbd2e0b4b5c2d3ef5a303ae9f (diff)
call "gpg2" not "gpg"
-rwxr-xr-xsrc/keygen.sh2
-rwxr-xr-xsrc/kiki-export-stdout2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/keygen.sh b/src/keygen.sh
index 1259b64..c51e268 100755
--- a/src/keygen.sh
+++ b/src/keygen.sh
@@ -2,7 +2,7 @@
2gpg_set_ultimate_trust() 2gpg_set_ultimate_trust()
3{ 3{
4 local keygrip 4 local keygrip
5 keygrip=$(gpg -K --with-colons --with-fingerprint --with-fingerprint|sed -ne '/^sec/{n;p;q}'|cut -d: -f10) 5 keygrip=$(gpg2 -K --with-colons --with-fingerprint --with-fingerprint|sed -ne '/^sec/{n;p;q}'|cut -d: -f10)
6 printf '%s:6:\n' "$keygrip" | gpg2 --import-ownertrust 6 printf '%s:6:\n' "$keygrip" | gpg2 --import-ownertrust
7} 7}
8 8
diff --git a/src/kiki-export-stdout b/src/kiki-export-stdout
index e508a61..76b315d 100755
--- a/src/kiki-export-stdout
+++ b/src/kiki-export-stdout
@@ -14,7 +14,7 @@ key=$($sudo kiki | sed -n -e 's/^master-key \([A-Fa-f0-9]*\) -/\1/p')
14 14
15if [ "$USE_GPG" ] 15if [ "$USE_GPG" ]
16then 16then
17 $sudo gpg --export "$key" 17 $sudo gpg2 --export "$key"
18else 18else
19 $sudo kiki merge \ 19 $sudo kiki merge \
20 --flow=spill,match="$key" \ 20 --flow=spill,match="$key" \