Prefix core variables with kanako_

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

git-svn-id: file:///srv/svn/repo/kanako/trunk@12 62e5d677-aa6e-8c4a-b8cb-b9416171cb8e
This commit is contained in:
koizumi.aoi 2022-10-18 22:18:10 +00:00
parent 8729322382
commit 1bf9f19349
2 changed files with 12 additions and 12 deletions

View File

@ -1,9 +1,9 @@
#!/bin/sh -e #!/bin/sh -e
readonly conf_dir="${conf_dir:-$HOME/.config/kanako}" readonly kanako_conf_dir="${conf_dir:-$HOME/.config/kanako}"
readonly store_dir="${store_dir:-$HOME/.kanako-store}" readonly kanako_store_dir="${store_dir:-$HOME/.kanako-store}"
if test -f "${conf_dir}"/kanako.conf; then if test -f "${kanako_conf_dir}"/kanako.conf; then
. "${conf_dir}"/kanako.conf . "${kanako_conf_dir}"/kanako.conf
else else
echo "Configuration file has not been found!" echo "Configuration file has not been found!"
exit 1 exit 1

16
kanako
View File

@ -1,19 +1,19 @@
#!/bin/sh -e #!/bin/sh -e
readonly conf_dir="${conf_dir:-$HOME/.config/kanako}" readonly kanako_conf_dir="${kanako_conf_dir:-$HOME/.config/kanako}"
readonly key_dir="${key_dir:-$HOME/.kanako}" readonly kanako_key_dir="${kanako_key_dir:-$HOME/.kanako}"
readonly store_dir="${store_dir:-$HOME/.kanako-store}" readonly kanako_store_dir="${kanako_store_dir:-$HOME/.kanako-store}"
if test -d "${store_dir}"; then if test -d "${kanako_store_dir}"; then
cd "${store_dir}" cd "${kanako_store_dir}"
else else
echo "Password store not found!" echo "Password store not found!"
echo "Create it with `mkdir -p $store_dir`" echo "Create it with mkdir -p $kanako_store_dir"
exit 1 exit 1
fi fi
if test -f "${conf_dir}/kanako.conf"; then if test -f "${kanako_conf_dir}/kanako.conf"; then
. "${conf_dir}/kanako.conf"; . "${kanako_conf_dir}/kanako.conf";
else else
echo "Configuration file has not been found!" echo "Configuration file has not been found!"
echo "Copy kanako.conf from the examples directory," echo "Copy kanako.conf from the examples directory,"