diff options
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | src/kiki-export-stdout | 35 | ||||
-rwxr-xr-x | src/kiki-import-stdin | 7 |
3 files changed, 43 insertions, 1 deletions
@@ -19,7 +19,7 @@ samizdat-pinentry: src/samizdat-pinentry.c | |||
19 | wait_for_files: src/wait_for_files.c | 19 | wait_for_files: src/wait_for_files.c |
20 | $(CC) $(CFLAGS) $< -o $@ | 20 | $(CC) $(CFLAGS) $< -o $@ |
21 | 21 | ||
22 | bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh selfstrap samizdat-daily-snapshot-root samizdat-diff-root) samizdat-paths.sh ${cc_files} ${btrfs_utils} | 22 | bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh selfstrap samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout kiki-import-stdin) samizdat-paths.sh ${cc_files} ${btrfs_utils} |
23 | 23 | ||
24 | btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed) | 24 | btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed) |
25 | 25 | ||
diff --git a/src/kiki-export-stdout b/src/kiki-export-stdout new file mode 100755 index 0000000..e508a61 --- /dev/null +++ b/src/kiki-export-stdout | |||
@@ -0,0 +1,35 @@ | |||
1 | #!/bin/sh | ||
2 | tempd=$(mktemp -d) || exit | ||
3 | : ${sudo:=sudo} | ||
4 | |||
5 | if [ "$USE_KIKI" ] | ||
6 | then | ||
7 | USE_GPG= | ||
8 | else | ||
9 | USE_GPG=y | ||
10 | fi | ||
11 | |||
12 | touch "$tempd"/ring.gpg | ||
13 | key=$($sudo kiki | sed -n -e 's/^master-key \([A-Fa-f0-9]*\) -/\1/p') | ||
14 | |||
15 | if [ "$USE_GPG" ] | ||
16 | then | ||
17 | $sudo gpg --export "$key" | ||
18 | else | ||
19 | $sudo kiki merge \ | ||
20 | --flow=spill,match="$key" \ | ||
21 | --home \ | ||
22 | --flow=fill \ | ||
23 | --type=keyring --access=public \ | ||
24 | "$tempd"/ring.gpg | ||
25 | fi | ||
26 | r=$? | ||
27 | |||
28 | if [ $r = 0 ] | ||
29 | then | ||
30 | cat "$tempd"/ring.gpg || r=$? | ||
31 | fi | ||
32 | |||
33 | rm -rf "$tempd" | ||
34 | exit $r | ||
35 | |||
diff --git a/src/kiki-import-stdin b/src/kiki-import-stdin new file mode 100755 index 0000000..2fd25d6 --- /dev/null +++ b/src/kiki-import-stdin | |||
@@ -0,0 +1,7 @@ | |||
1 | #!/bin/sh | ||
2 | tempd=$(mktemp -d) || exit | ||
3 | cat > "$tempd"/ring.gpg | ||
4 | kiki import-public --import --autosign --import-if-authentic --keyrings "$tempd"/ring.gpg | ||
5 | r=$? | ||
6 | rm -rf "$tempd" | ||
7 | exit $r | ||