Worth a tag?

Signed-off-by: Aoi K <koizumi.aoi@kyoko-project.wer.ee>

git-svn-id: file:///srv/svn/repo/kanako/trunk@15 62e5d677-aa6e-8c4a-b8cb-b9416171cb8e

README.md

@@ -15,7 +15,9 @@ the adaptable password manager. named after [Kanako Yasaka](https://en.touhouwik
 ## Add-ons
 
 ### kanako_gen
-random username and password generator, requires `busybox(1)`
+random username and password generator, requires `strings(1)`,
+`dd(1)` and a sane `tr(1)` (FreeBSD's one behaves differently and
+in unexpected ways)
 
 ### kanako_menu
 quick graphical front-end for kanako, works with either of `dmenu(1)`
@@ -30,6 +32,7 @@ from oath-toolkit.
 
 ## Related software
 * [akoizumi/ayu](https://git.shelltalk.net/akoizumi/ayu) [predecessor]
+* [beastie/aps](https://codeberg.org/beastie/aps)
 * [biox/pa](https://github.com/biox/pa)
 * [e-zk/page](https://github.com/e-zk/page)
 * [kl3/spm](https://notabug.org/kl3/spm)

addons/kanako_gen

@@ -1,10 +1,10 @@
 #!/bin/sh -e
 
 fn_genpass() {
-    printf "Password: %s\n" $(busybox tr -dc '[A-Z][a-z][0-9]' </dev/urandom | dd bs=1 count=${1:-80} 2>/dev/null; echo)
+    printf "Password: %s\n" $(strings </dev/urandom | dd bs=1 count=${1:-80} 2>/dev/null | tr -d " \t\n\r")
 }
 fn_genuser() {
-    printf "Username: %s\n" $(busybox tr -dc '[A-Z][a-z][0-9]' </dev/urandom | dd bs=1 count=10 2>/dev/null; echo)
+    printf "Username: %s\n" $(strings </dev/urandom | dd bs=1 count=10 2>/dev/null | tr -d " \t\n\r")
 }
 
 case $1 in

addons/kanako_menu

@@ -9,4 +9,4 @@ else
     exit 1
 fi
 
-find . -name '*.enc' | sort | sed 's,^\./,,;s,\.enc$,,' | ${menu_prog} | xargs $(which kanako) -c
+find . -name '*.enc' | sort | sed 's,^\./,,;s,\.enc$,,' | "${kanako_menu_cmd}" | xargs $(which kanako) -c

kanako

@@ -45,7 +45,7 @@ fn_new() {
     rm ${tmpfile}
 }
 fn_trash_directory() {
-    rm -rf "$@"
+    rm -rf "$1"
 }
 fn_trash_file() {
     rm -f "${1}${2}".enc

kanako.conf.example

@@ -3,6 +3,7 @@
 #kanako_clip_cmd="xclip -i"
 #kanako_clip_cmd="wl-copy --primary"
 #kanako_list_cmd="tree"
+#kanako_menu_cmd="dmenu"
 
 ## age
 #kanako_encrypt_cmd="age"

kanako.conf.mdoc

@@ -1,36 +1,30 @@
-.Dd Bureaucracy 73, 3188
+.Dd Aftermath 41, 3188
 .Dt KANAKO.CONF 5
 .Os
 .Sh NAME
 .Nm kanako.conf
 .Nd configuration file for
 .Xr kanako 1
-.Sh KEYS
+.Sh FIELDS
-.Ss General section
 .Bl -tag -width 11n -compact
-.It clip_cmd
+.It kanako_clip_cmd
-Clipboard manager command
+Clipboard executable to be
-.It debug
+used with the -c switch
-Controls whether to use debug
+.It kanako_decrypt_args
-mode or not. Any value other
+Arguments for decryption
-than false is interpreted as
+passed to kanako_encrypt_cmd
-true.
+.It kanako_encrypt_args
-.It list_cmd
+Arguments for encryption
-Command used to print a listing
+passed to kanako_encrypt_cmd
-of the password store
+.It kanako_encrypt_cmd
-.It menu_cmd
+Encryption executable to
-Menu command for kanako_menu
+be used with the program
-.El
+.It kanako_list_cmd
-.Ss Encryption section
+Listing executable to
-.Bl -tag -width 11n -compact
+be used with the -l switch
-.It encrypt_cmd
+.It kanako_menu_cmd
-Command to handle encryption
+Menu executable to
-.It encrypt_args
+be used with kanako_menu
-Options to be passed to
-encrypt_cmd for encryption
-.It decrypt_args
-Options to be passed to
-encrypt_cmd for decryption
 .El
 .Sh SEE ALSO
 .Xr kanako 1

kanako.mdoc

@@ -6,25 +6,13 @@
 .Nd the adaptable password manager
 .Sh SYNOPSIS
 .Nm
-.Fl c
+.Fl c Ar args
-.Ar args
+.Fl e Ar args
-.Nm
-.Fl e
-.Ar args
-.Nm
 .Fl l
-.Nm
+.Fl n Ar args
-.Fl n
+.Fl r Ar args
-.Ar args
+.Fl R Ar args
-.Nm
+.Fl v Ar args
-.Fl r
-.Ar args
-.Nm
-.Fl R
-.Ar args
-.Nm
-.Fl v
-.Ar args
 .Sh DESCRIPTION
 It is a clean rewrite of
 .Xr ayu 1