Adds COMMIT_AFTER_ENCRYPT setting

diff --git a/ChangeLog b/ChangeLog
index 1142a1a709e2e54210b46bd23e276137b35bc50f..83defe1dc763087beffecb51763bbcaab06626f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-25 - Silvio Rhatto <rhatto@riseup.net>
+
+       Adds COMMIT_AFTER_ENCRYPT setting
+
 2019-01-29 - 0.5.4 - Silvio Rhatto <rhatto@riseup.net>
 
        Use --no-encrypt-to GnuPG option to strictly respect the recipients file

diff --git a/lib/keyringer/actions/encrypt b/lib/keyringer/actions/encrypt
index 11db62cf296783fe1e6a256f7016113debe3934e..e25ad6ce470eb695d8c0d4d9d8ff4f38eb8d671a 100755 (executable)
--- a/lib/keyringer/actions/encrypt
+++ b/lib/keyringer/actions/encrypt
@@ -124,5 +124,10 @@ if [ -d "$BASEDIR/.git" ]; then
   keyringer_exec git "$BASEDIR" add "keys/$FILE"
 fi
 
+# Optional commit depending on the value of this setting
+if [ "$COMMIT_AFTER_ENCRYPT" == "yes" ]; then
+  keyringer_exec git "$BASEDIR" commit -m "Changes for $FILE"
+fi
+
 # Done
 exit "$?"