From 3f88dad5b575c8a7709f788e7e4fca7409889ccc Mon Sep 17 00:00:00 2001
From: Jacob Bachmeyer <jcb@gnu.org>
Date: Thu, 12 Jan 2023 22:42:28 -0600
Subject: [PATCH] Remove "pgpg" helper script

---
 ftp-addkey.sh | 2 +-
 ftp-rmkey.sh  | 5 +++--
 pgpg          | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100755 pgpg

diff --git a/ftp-addkey.sh b/ftp-addkey.sh
index 4770ca3..57e8763 100755
--- a/ftp-addkey.sh
+++ b/ftp-addkey.sh
@@ -41,7 +41,7 @@ echo $2 >> $PACKAGES/$1/email
 
 echo "Adding key..."
 
-pgpg $1 --import $3
+gpg --no-default-keyring --keyring $PACKAGES/$1/pubring.gpg --import $3
 
 chmod -R 755 $PACKAGES/$1
 
diff --git a/ftp-rmkey.sh b/ftp-rmkey.sh
index a7efa95..692fabf 100755
--- a/ftp-rmkey.sh
+++ b/ftp-rmkey.sh
@@ -38,9 +38,10 @@ then
 fi
 
 echo "Importing old key into $EXPIRED_KEYRING..."
-pgpg $1 --export $2 | gpg --no-default-keyring --keyring $EXPIRED_KEYRING --import
+gpg --no-default-keyring --keyring $PACKAGES/$1/pubring.gpg --export $2 \
+    | gpg --no-default-keyring --keyring $EXPIRED_KEYRING --import
 
 echo "Removing key..."
-pgpg $1 --delete-key $2
+gpg --no-default-keyring --keyring $PACKAGES/$1/pubring.gpg --delete-key $2
 
 echo "Make sure to remove the email address from $PACKAGES/$1/email."
diff --git a/pgpg b/pgpg
deleted file mode 100755
index 136d450..0000000
--- a/pgpg
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/bin/gpg --no-default-keyring --keyring /home/gatekpr/packages/$1/pubring.gpg $2 $3 $4 $5 $6 $7 $8 $9
-- 
2.25.1