From c5b447359303979ac91e8cea126d14480536df94 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 22 Jan 2011 13:00:43 -0200 Subject: Renaming lib/keyringer to lib/bash --- share/keyringer/append | 2 +- share/keyringer/append-batch | 36 +++++++++++++++++++++++++++++++++++- share/keyringer/decrypt | 2 +- share/keyringer/del | 2 +- share/keyringer/edit | 2 +- share/keyringer/encrypt | 2 +- share/keyringer/encrypt-batch | 27 ++++++++++++++++++++++++++- share/keyringer/genpair | 2 +- share/keyringer/git | 2 +- share/keyringer/ls | 2 +- share/keyringer/options | 2 +- share/keyringer/recipients | 2 +- share/keyringer/recrypt | 2 +- 13 files changed, 72 insertions(+), 13 deletions(-) mode change 120000 => 100755 share/keyringer/append-batch mode change 120000 => 100755 share/keyringer/encrypt-batch (limited to 'share') diff --git a/share/keyringer/append b/share/keyringer/append index 045ba86..5570b6e 100755 --- a/share/keyringer/append +++ b/share/keyringer/append @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/append-batch b/share/keyringer/append-batch deleted file mode 120000 index 6b140f7..0000000 --- a/share/keyringer/append-batch +++ /dev/null @@ -1 +0,0 @@ -append \ No newline at end of file diff --git a/share/keyringer/append-batch b/share/keyringer/append-batch new file mode 100755 index 0000000..5570b6e --- /dev/null +++ b/share/keyringer/append-batch @@ -0,0 +1,35 @@ +#!/bin/bash +# +# Append information into encrypted files. +# + +# Load functions +LIB="`dirname $0`/../../lib/bash/functions" +source "$LIB" || exit 1 + +# Get file +keyringer_get_file "$2" + +OLDIFS="$IFS" +IFS=$'\n' + +CONTENT=($(keyringer_exec decrypt "$BASEDIR" "$FILE")) + +if [ "$BASENAME" == "append" ]; then + # only display directions if we're running append, not append-batch + printf "\n%s currently has %d lines\n\n" "$FILE" "${#CONTENT[@]}" + printf "Now please write the content to be appended on %s, finnishing with Ctrl-D:\n" "$FILE" +fi + +# FIXME: dkg doesn't know how to check that this does proper escaping +# (2010-11-16) + +APPEND=($(cat -)) + +NEW=( ${CONTENT[@]} ${APPEND[@]} ) + +for element in $(seq 0 $((${#NEW[@]} - 1))); do + echo ${NEW[$element]} +done | keyringer_exec encrypt-batch $BASEDIR $FILE + +IFS="$OLDIFS" diff --git a/share/keyringer/decrypt b/share/keyringer/decrypt index c0584f2..c316e8d 100755 --- a/share/keyringer/decrypt +++ b/share/keyringer/decrypt @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/del b/share/keyringer/del index 4eca0e3..b10d6a3 100755 --- a/share/keyringer/del +++ b/share/keyringer/del @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/edit b/share/keyringer/edit index 0c25f64..6ece837 100755 --- a/share/keyringer/edit +++ b/share/keyringer/edit @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/encrypt b/share/keyringer/encrypt index 8cbf72a..915af3c 100755 --- a/share/keyringer/encrypt +++ b/share/keyringer/encrypt @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Aditional parameters diff --git a/share/keyringer/encrypt-batch b/share/keyringer/encrypt-batch deleted file mode 120000 index 8267197..0000000 --- a/share/keyringer/encrypt-batch +++ /dev/null @@ -1 +0,0 @@ -encrypt \ No newline at end of file diff --git a/share/keyringer/encrypt-batch b/share/keyringer/encrypt-batch new file mode 100755 index 0000000..915af3c --- /dev/null +++ b/share/keyringer/encrypt-batch @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Encrypt files to multiple recipients. +# + +# Load functions +LIB="`dirname $0`/../../lib/bash/functions" +source "$LIB" || exit 1 + +# Aditional parameters +keyringer_get_new_file "$2" + +# Encrypt +mkdir -p "$KEYDIR/`dirname $FILE`" + +if [ "$BASENAME" == "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 +if [ -d "$BASEDIR/.git" ]; then + keyringer_exec git "$BASEDIR" add "keys/$FILE" +fi diff --git a/share/keyringer/genpair b/share/keyringer/genpair index a2aca98..5cb606f 100755 --- a/share/keyringer/genpair +++ b/share/keyringer/genpair @@ -140,7 +140,7 @@ function genpair_ssl { } # Load functions -LIB="`dirname $0`/../../lib/keyringer" +LIB="`dirname $0`/../../lib/bash" source "$LIB/functions" || exit 1 # Aditional parameters diff --git a/share/keyringer/git b/share/keyringer/git index cd2a188..cd9879c 100755 --- a/share/keyringer/git +++ b/share/keyringer/git @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Aditional parameters diff --git a/share/keyringer/ls b/share/keyringer/ls index 31e8805..f63f95d 100755 --- a/share/keyringer/ls +++ b/share/keyringer/ls @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Aditional parameters diff --git a/share/keyringer/options b/share/keyringer/options index 3047380..abcca50 100755 --- a/share/keyringer/options +++ b/share/keyringer/options @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer" +LIB="`dirname $0`/../../lib/bash" source "$LIB/functions" || exit 1 # Command parser diff --git a/share/keyringer/recipients b/share/keyringer/recipients index 2fe2ddf..abf4d94 100755 --- a/share/keyringer/recipients +++ b/share/keyringer/recipients @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer" +LIB="`dirname $0`/../../lib/bash" source "$LIB/functions" || exit 1 # Command parser diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt index a7607e0..2ea859b 100755 --- a/share/keyringer/recrypt +++ b/share/keyringer/recrypt @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file -- cgit v1.2.3