Fixed annoying bug on edit() after months of leaving it unnoticed

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/kanako/trunk@23 62e5d677-aa6e-8c4a-b8cb-b9416171cb8e
This commit is contained in:
yakumo.izuru 2024-07-13 22:32:13 +00:00
parent 12ab49594b
commit 0ffc813500
4 changed files with 59 additions and 84 deletions

View File

@ -1,18 +1,14 @@
PREFIX=/usr/local
install: install-bin install-examples install-man
uninstall: uninstall-bin uninstall-examples uninstall-man
fmt:
shfmt --posix --write kanako
install-bin:
install:
install -Dm0755 kanako ${DESTDIR}${PREFIX}/bin/kanako
install-examples:
install -Dm0600 kanako.conf.example ${DESTDIR}${PREFIX}/share/examples/kanako/kanako.conf
install-man:
install -Dm0600 kanako.mdoc ${DESTDIR}${PREFIX}/share/man/man1/kanako.1
install -Dm0600 kanako.conf.mdoc ${DESTDIR}${PREFIX}/share/man/man5/kanako.conf.5
uninstall-bin:
uninstall:
rm -f ${PREFIX}/bin/kanako
uninstall-examples:
rm -f ${PREFIX}/share/examples/kanako/kanako.conf ${PREFIX}/share/exmaples/kanako/kanakomenu.conf
uninstall-man:
rm -f ${PREFIX}/share/examples/kanako/kanako.conf
rm -f ${PREFIX}/share/man/man1/kanako.1 ${PREFIX}/share/man/man5/kanako.conf.5

7
kanako
View File

@ -14,7 +14,7 @@ else
fi
if test -f "${kanako_conf_dir}/kanako.conf"; then
. "${kanako_conf_dir}/kanako.conf";
. "${kanako_conf_dir}/kanako.conf"
else
printf "Configuration file has not been found!\n"
printf "Copy kanako.conf from the examples directory,\n"
@ -26,11 +26,14 @@ copy() {
view "$1" | "${kanako_clip_cmd}"
}
edit() {
# FIXME: Need a way to find out if file exists
if [ -f ${1%%.enc}.enc ]; then
${kanako_encrypt_cmd} ${kanako_decrypt_args} ${1%%.enc}.enc >${1%%.enc}
"${EDITOR:-${EDITOR:-vi}}" "${1%%.enc}"
${kanako_encrypt_cmd} ${kanako_encrypt_args} ${1%%.enc} >${1%%.enc}.enc
rm "${1%%.enc}"
else
printf "%s does not exist, maybe there was a typo on your end?\n" "${1%%.enc}.enc"
fi
}
gen() {
printf "%s\n" $(strings </dev/urandom | dd bs=1 count="${1:-30}" 2>/dev/null | tr -d ' \t\n\r')

View File

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

18
mkfile
View File

@ -1,18 +0,0 @@
PREFIX=/usr/local
install:V: install-bin install-examples install-man
uninstall:V: uninstall-bin uninstall-examples uninstall-man
install-bin:
install -Dm0755 kanako $DESTDIR$PREFIX/bin/kanako
install-examples:
install -Dm0600 kanako.conf.example $DESTDIR$PREFIX/share/examples/kanako/kanako.conf
install-man:
install -Dm0600 kanako.mdoc $DESTDIR$PREFIX/share/man/man1/kanako.1
install -Dm0600 kanako.conf.mdoc $DESTDIR$PREFIX/share/man/man5/kanako.conf.5
uninstall-bin:
rm -f $PREFIX/bin/kanako
uninstall-examples:
rm -f $PREFIX/share/examples/kanako/kanako.conf $PREFIX/share/exmaples/kanako/kanakomenu.conf
uninstall-man:
rm -f $PREFIX/share/man/man1/kanako.1 $PREFIX/share/man/man5/kanako.conf.5