cleanup: Use --delete-secret-and-public-key to delete GPG_PRIVATE_KEY (#226)

bjhargrave · web-flow · commit d34438b137f3 · 2021-09-22T11:39:53.000+03:00
This deletes the secret key(s) and public keys(s) for the fingerprint
of the installed GPG_PRIVATE_KEY.

If the installed GPG_PRIVATE_KEY only contains a signing subkey without
the primary private key, the --delete-secret-and-public-key will
successfully delete the keys.

Signed-off-by: BJ Hargrave &lt;bj@hargrave.dev&gt;
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
@@ -63237,10 +63237,9 @@ function importKey(privateKey) {
 exports.importKey = importKey;
 function deleteKey(keyFingerprint) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield exec.exec('gpg', ['--batch', '--yes', '--delete-secret-keys', keyFingerprint], {
+        yield exec.exec('gpg', ['--batch', '--yes', '--delete-secret-and-public-key', keyFingerprint], {
             silent: true
         });
-        yield exec.exec('gpg', ['--batch', '--yes', '--delete-keys', keyFingerprint], { silent: true });
     });
 }
 exports.deleteKey = deleteKey;
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -94689,10 +94689,9 @@ function importKey(privateKey) {
 exports.importKey = importKey;
 function deleteKey(keyFingerprint) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield exec.exec('gpg', ['--batch', '--yes', '--delete-secret-keys', keyFingerprint], {
+        yield exec.exec('gpg', ['--batch', '--yes', '--delete-secret-and-public-key', keyFingerprint], {
             silent: true
         });
-        yield exec.exec('gpg', ['--batch', '--yes', '--delete-keys', keyFingerprint], { silent: true });
     });
 }
 exports.deleteKey = deleteKey;
diff --git a/src/gpg.ts b/src/gpg.ts
@@ -39,8 +39,7 @@ export async function importKey(privateKey: string) {
 }
 
 export async function deleteKey(keyFingerprint: string) {
-  await exec.exec('gpg', ['--batch', '--yes', '--delete-secret-keys', keyFingerprint], {
+  await exec.exec('gpg', ['--batch', '--yes', '--delete-secret-and-public-key', keyFingerprint], {
     silent: true
   });
-  await exec.exec('gpg', ['--batch', '--yes', '--delete-keys', keyFingerprint], { silent: true });
 }

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ export async function importKey(privateKey: string) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`export async function deleteKey(keyFingerprint: string) {`
`42`		`- await exec.exec('gpg', ['--batch', '--yes', '--delete-secret-keys', keyFingerprint], {`
	`42`	`+ await exec.exec('gpg', ['--batch', '--yes', '--delete-secret-and-public-key', keyFingerprint], {`
`43`	`43`	`silent: true`
`44`	`44`	`});`
`45`		`- await exec.exec('gpg', ['--batch', '--yes', '--delete-keys', keyFingerprint], { silent: true });`
`46`	`45`	`}`