diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2019-12-16 08:16:16 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-12-16 08:16:16 +1300 |
| commit | d2ab5b4d14b73dfada6022889640dfda80ca889e (patch) | |
| tree | 77f237e59c14448d12a0b342a91a8bcc509957c4 | |
| parent | First version (diff) | |
| parent | Bump VERSION (diff) | |
| download | parcimini-0.1.1.tar.gz (sig) parcimini-0.1.1.zip | |
Merge branch 'hotfix/v0.1.1'v0.1.1
* hotfix/v0.1.1:
Remove numeric suffix for GnuPG binary
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | parcimini.bash | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -1 +1 @@ -0.1.0 +0.1.1 diff --git a/parcimini.bash b/parcimini.bash index 11c7207..b3a2dc4 100644 --- a/parcimini.bash +++ b/parcimini.bash @@ -3,8 +3,8 @@ self=parcimini # Base interval between key retrievals from first arg; default 20 mins interval=${1:-1200} -# Check we have gpg2 and shuf, neither of which are POSIX -hash gpg2 || exit +# Check we have gpg and shuf, neither of which are POSIX +hash gpg || exit hash shuf || exit # Make a temporary file for the key listings, delete on exit @@ -13,7 +13,7 @@ list=$(mktemp) || exit # Define a function to retrieve all keychain fingerprints key_ids() { - gpg2 --batch --no-tty --list-keys --with-colons | + gpg --batch --no-tty --list-keys --with-colons | awk 'BEGIN { FS = ":" } $1 == "pub" { pub = 1 ; next } $1 == "fpr" && pub { pub = 0 ; key_ids[$(NF-1)]++ } @@ -42,7 +42,7 @@ while key_ids > "$list" ; do # Retrieve key printf >&2 '%s: Retrieving key %s...\n' \ "$self" "$key_id" - gpg2 --batch --no-tty --recv-key "$key_id" + gpg --batch --no-tty --recv-key "$key_id" done done |