Changeset 12 in code

Timestamp:

Oct 18, 2022, 10:18:10 PM (3 years ago)

Author:

koizumi.aoi

Message:

Prefix core variables with kanako_

Signed-off-by: Aoi K <koizumi.aoi@…>

Location:

trunk

Files:

• addons/kanako_menu (modified) (1 diff)
• kanako (modified) (1 diff)

trunk/addons/kanako_menu

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

trunk/kanako

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