From ab583a9e2a2e0f8452016cfc968339d638da40b4 Mon Sep 17 00:00:00 2001
From: Jamie McClelland <jm@mayfirst.org>
Date: Sun, 19 Sep 2010 12:44:11 -0400
Subject: adding new commands append-batch and encrypt-batch, which reduce the
 verbosity of the messages being displayed.

---
 share/keyringer/append        | 13 ++++++++-----
 share/keyringer/append-batch  |  1 +
 share/keyringer/encrypt       |  7 ++++++-
 share/keyringer/encrypt-batch |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 120000 share/keyringer/append-batch
 create mode 120000 share/keyringer/encrypt-batch

diff --git a/share/keyringer/append b/share/keyringer/append
index 436b1ca..81300e0 100755
--- a/share/keyringer/append
+++ b/share/keyringer/append
@@ -15,10 +15,13 @@ IFS=$'\n'
 
 CONTENT=($(keyringer_exec decrypt $BASEDIR $FILE))
 
-echo " "
-echo "$FILE currently has ${#CONTENT[@]} lines"
-echo " "
-echo "Now please write the content to be appended on $FILE, finnishing with Ctrl-D:"
+if [ "$1" = "append" ]; then
+  # only display directions if we're running append, not append-batch
+  echo " "
+  echo "$FILE currently has ${#CONTENT[@]} lines"
+  echo " "
+  echo "Now please write the content to be appended on $FILE, finnishing with Ctrl-D:"
+fi
 
 APPEND=($(cat -))
 
@@ -26,6 +29,6 @@ NEW=( ${CONTENT[@]} ${APPEND[@]} )
 
 for element in $(seq 0 $((${#NEW[@]} - 1))); do
   echo ${NEW[$element]}
-done | keyringer_exec encrypt $BASEDIR $FILE
+done | keyringer_exec encrypt-batch $BASEDIR $FILE
 
 IFS="$OLDIFS"
diff --git a/share/keyringer/append-batch b/share/keyringer/append-batch
new file mode 120000
index 0000000..6b140f7
--- /dev/null
+++ b/share/keyringer/append-batch
@@ -0,0 +1 @@
+append
\ No newline at end of file
diff --git a/share/keyringer/encrypt b/share/keyringer/encrypt
index ac2a43e..14ee707 100755
--- a/share/keyringer/encrypt
+++ b/share/keyringer/encrypt
@@ -12,7 +12,12 @@ keyringer_get_new_file $2
 
 # Encrypt
 mkdir -p $KEYDIR/`dirname $FILE`
-echo "Type your message and finish your input with EOF (Ctrl-D)."
+
+if [ "$1" = "encrypt" ]; then
+  # only display directions if we're running encrypt, not encrypt-batch
+  echo "Type your message and finish your input with EOF (Ctrl-D)."
+fi
+
 gpg --use-agent --armor -e -s $(keyringer_recipients $RECIPIENTS) - > $KEYDIR/$FILE
 
 # Stage
diff --git a/share/keyringer/encrypt-batch b/share/keyringer/encrypt-batch
new file mode 120000
index 0000000..8267197
--- /dev/null
+++ b/share/keyringer/encrypt-batch
@@ -0,0 +1 @@
+encrypt
\ No newline at end of file
-- 
cgit v1.2.3