aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-05-27 13:36:31 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-05-27 13:36:31 -0300
commitfc4741eb7f96d94ce8de70d9e5082a294cc30202 (patch)
tree455f09e0cc128f09b8b0fda095dfc40bdffb9074
parentd32ac3284c072ce367919418a554c724bc6b0fa3 (diff)
parente1e668083796c16ebc444fcdc0902bc7030777e4 (diff)
downloadkeyringer-fc4741eb7f96d94ce8de70d9e5082a294cc30202.tar.gz
keyringer-fc4741eb7f96d94ce8de70d9e5082a294cc30202.tar.bz2
Merge branches 'master' and 'ruby' into ruby
-rw-r--r--README4
-rwxr-xr-xshare/keyringer/recrypt20
2 files changed, 18 insertions, 6 deletions
diff --git a/README b/README
index a62c102..f3188f6 100644
--- a/README
+++ b/README
@@ -88,9 +88,9 @@ Decrypting a key (only to stdout)
keyringer <keyring> decrypt <file>
-Re-encrypting a key
+Re-encrypting a key or the whole repository
- keyringer <keyring> recrypt <file>
+ keyringer <keyring> recrypt [file]
Appending information to a key
diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt
index 2ea859b..f25450a 100755
--- a/share/keyringer/recrypt
+++ b/share/keyringer/recrypt
@@ -7,8 +7,20 @@
LIB="`dirname $0`/../../lib/bash/functions"
source "$LIB" || exit 1
-# Get file
-keyringer_get_file "$2"
+function keyringer_recrypt {
+ # Get file
+ keyringer_get_file "$1"
-# Recrypt
-gpg --use-agent -d "$KEYDIR/$FILE" | gpg --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS") > "$KEYDIR/$FILE"
+ # Recrypt
+ gpg --use-agent -d "$KEYDIR/$FILE" | gpg --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS") > "$KEYDIR/$FILE"
+}
+
+if [ ! -z "$2" ]; then
+ keyringer_recrypt $2
+else
+ cd $KEYDIR && find | while read file; do
+ if [ ! -d "$KEYDIR/$file" ]; then
+ keyringer_recrypt "$file"
+ fi
+ done
+fi