From c46d0e777993c3362b5512f091a84e79b7048fc2 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 25 Mar 2019 18:25:11 -0300
Subject: Adds COMMIT_AFTER_ENCRYPT setting

---
 lib/keyringer/actions/encrypt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/keyringer/actions/encrypt')

diff --git a/lib/keyringer/actions/encrypt b/lib/keyringer/actions/encrypt
index 11db62c..e25ad6c 100755
--- 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 "$?"
-- 
cgit v1.2.3


From 94047d1bc49ccd68f889ddbf70f9f20ebcbfef71 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 25 Mar 2019 18:38:29 -0300
Subject: Adds PUSH_AFTER_ENCRYPT setting

---
 lib/keyringer/actions/encrypt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/keyringer/actions/encrypt')

diff --git a/lib/keyringer/actions/encrypt b/lib/keyringer/actions/encrypt
index e25ad6c..c1d5601 100755
--- a/lib/keyringer/actions/encrypt
+++ b/lib/keyringer/actions/encrypt
@@ -126,7 +126,13 @@ 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"
+  FILE="`echo $FILE | sed -e 's|/./||'`"
+  echo Changes for keys/$FILE | keyringer_exec git "$BASEDIR" commit -F -
+fi
+
+# Optional push depending on the value of this setting
+if [ "$PUSH_AFTER_ENCRYPT" == "yes" ]; then
+  keyringer_exec git "$BASEDIR" push
 fi
 
 # Done
-- 
cgit v1.2.3


From 53e30563bd825d21d276b3f9c79e94bb754f642f Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 25 Mar 2019 19:26:51 -0300
Subject: Fix secret name when encrypting a folder

---
 ChangeLog                     | 2 ++
 lib/keyringer/actions/encrypt | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/keyringer/actions/encrypt')

diff --git a/ChangeLog b/ChangeLog
index 10da2b2..f503212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 
 	Fix git parameter expansion
 
+	Fix secret name when encrypting a folder
+
 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 c1d5601..1256374 100755
--- a/lib/keyringer/actions/encrypt
+++ b/lib/keyringer/actions/encrypt
@@ -95,9 +95,14 @@ if [ "$UNENCRYPTED_FILE" != "-" ] && [ -d "$UNENCRYPTED_FILE" ]; then
   # Time to go recursive
   BASEPATH="`basename $FILE .asc`"
   FILEPATH="`dirname "$UNENCRYPTED_FILE"`"
+
+  if [ "$FILEPATH" == "." ]; then
+    FILEPATH="$(cd `dirname "$UNENCRYPTED_FILE"` &> /dev/null & pwd)"
+  fi
+
   find $UNENCRYPTED_FILE | while read file; do
     if [ ! -d "$file" ]; then
-      dir="`dirname "$file" | sed -e "s|^$FILEPATH|$BASEPATH|g"`"
+      dir="`dirname "$file" | sed -e "s|^$UNENCRYPTED_FILE|$BASEPATH|" -e "s|^$FILEPATH|$BASEPATH|"`"
       keyringer_get_new_file `basename "$file"`
       keyringer_encrypt "$dir/$FILE" $file
     fi
-- 
cgit v1.2.3