Check the commit log for changes, there are a lot!

Signed-off-by: Aoi Koizumi <novaburst@kalli.st>

1 files changed, 35 insertions, 42 deletions

diff --git a/ayu b/ayu
index 23ab4ec..b6b22c6 100755
--- a/ayu
+++ b/ayu
@@ -3,32 +3,41 @@
 # ayu(1) - an actually boring password manager, which uses age(1) as backend.
 
 # Path to the program's directory
-ayu_dir="${ayu_dir:-$HOME/.config/ayu}"
+ayu_dir="${ayu_dir:-$HOME/.ayu}"
 
 # Path to the password store
-ayu_store="${ayu_store:-$HOME/.ayu}"
+ayu_store="${ayu_store:-$HOME/.ayu-store}"
+
+# Command to copy an entry's text into the clipboard (must accept standard input)
+clipboard="xsel -ib"
 
 # Path to the age(1) keys
-ayu_key="${ayu_key:-${ayu_dir}/sec.age}"
-ayu_pub="${ayu_pub:-${ayu_dir}/pub.age}"
+private_key="${private_key:-${ayu_dir}/private_key}"
+public_key="${public_key:-${ayu_dir}/public_key}"
 
+# Default editor to be used
 EDITOR=${EDITOR:-vi}
 
 # Run some tests
 test -d $ayu_dir || mkdir -p $ayu_dir
 test -d $ayu_store || mkdir -p $ayu_store
 
-test -f $ayu_key || printf "$0: Generate your own age(1) key with age-keygen(1) and place it as a $ayu_key. \n"
-test -f $ayu_pub || printf "$0: Public key needs to be placed on $ayu_pub (Hint: it's the visible output of age-keygen(1)) \n"
+test -f $private_key || printf "$0: Generate your own age(1) key with age-keygen(1) and place it as a $private_key. \n"
+test -f $public_key || printf "$0: Public key needs to be placed on $public_key (Hint: it's the visible output of age-keygen(1)) \n"
 
 # Switch directory to the password store, otherwise bail out.
 cd $ayu_store || exit 1
 
+# Copy an entry to the clipboard
+copy() {
+	view "$2" | sed 1q | $clipboard
+}
+
 # Edit an entry if it exists
 edit() {
-	age --decrypt --identity=$ayu_key --output=${1%%.age} ${1%%.age}.age
+	age --decrypt --identity=$private_key --output=${1%%.age} ${1%%.age}.age
 	${EDITOR} ${1%%.age}
-	age --encrypt -R $ayu_pub --output=${1%%.age}.age ${1%%.age}
+	age --encrypt -R $public_key --output=${1%%.age}.age ${1%%.age}
 	rm ${1%%.age}
 }
 
@@ -45,31 +54,30 @@ new() {
 	${EDITOR} "$tmpfile"
 
 	mkdir -p "$(dirname "$1")"
-	age --encrypt -R $ayu_pub -o $tmpfile.age $tmpfile
+	age --encrypt -R $public_key -o $tmpfile.age $tmpfile
 
 	mv $tmpfile.age "${1%%.age}".age
 	rm $tmpfile
 }
 
 # Remove
-re() {
-	rm -v ${1}${2}.age
-}
-# Remove-recursive
-rr() {
-	test -d "$@" && usage && exit
-	rm -r -v "$(dirname "$@")"
+remove() {
+	rm -f ${1}${2}.age
 }
 
+# Remove recursively
+remove_recursive() {
+	rm -rf "$@"
+}
 # Print usage
 usage() {
-	printf "$0 [ ed | ls | new | re | rr | vi ] \n"
+	printf "$0 [ -c | -e | -l | -n | -r | -R | -v ] <entry> \n"
 }
 
 # View an entry, otherwise list the contents of the directory specified.
 view() {
 	if [ -f "${1%%.age}".age ];then
-		age --decrypt --identity=$ayu_key "${1%%.age}".age
+		age --decrypt --identity=$private_key "${1%%.age}".age
 	elif [ -d "${1:-.}" ];then
 		tree "${1:-.}"
 	else
@@ -79,28 +87,13 @@ view() {
 }
 
 case $1 in
-	edit | ed)
-		edit $2
-		;;
-	list | ls)
-		list
-		;;
-	new)
-		new $2
-		;;
-	remove | re)
-		re $2 $3
-		;;
-	remove-recursive | rr)
-		rr $2
-		;;
-	usage)
-		usage
-		;;
-	view | vi)
-		view $2
-		;;
-	*)
-		list
-		;;
+	-c) copy $2 ;;
+	-e) edit $2 ;;
+	-l) list ;;
+	-n) new $2 ;;
+	-r) remove $2 $3 ;;
+	-R) remove_recursive $2 ;;
+	-h) usage ;;
+	-v) view $2 ;;
+	*) usage ;;
 esac