From dd4905ccfbb1d98b73be6d96835145e380d67585 Mon Sep 17 00:00:00 2001
From: Pablo Correa Gomez <ablocorrea@hotmail.com>
Date: Tue, 24 Sep 2024 19:09:53 +0000
Subject: [PATCH] Make /usr/share paths comply with FHS
---
buffyboard/README.md | 4 ++--
buffyboard/command_line.c | 4 ++--
buffyboard/doc/buffyboard.1.scd | 4 ++--
buffyboard/doc/buffyboard.conf.5.scd | 4 ++--
buffyboard/main.c | 4 ++--
unl0kr/README.md | 4 ++--
unl0kr/command_line.c | 4 ++--
unl0kr/doc/unl0kr.1.scd | 6 +++---
unl0kr/doc/unl0kr.conf.5.scd | 4 ++--
unl0kr/main.c | 4 ++--
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/buffyboard/README.md b/buffyboard/README.md
index 1ff2093..d1d9421 100644
--- a/buffyboard/README.md
+++ b/buffyboard/README.md
@@ -44,8 +44,8 @@ Mandatory arguments to long options are mandatory for short options too.
-C, --config-override Path to a config override file. Can be supplied
multiple times. Config files are merged in the
following order:
- * /usr/share/buffyboard.conf
- * /usr/share/buffyboard.conf.d/* (alphabetically)
+ * /usr/share/buffyboard/buffyboard.conf
+ * /usr/share/buffyboard/buffyboard.conf.d/* (alphabetically)
* /etc/buffyboard.conf
* /etc/buffyboard.conf.d/* (alphabetically)
* Override files (in supplied order)
diff --git a/buffyboard/command_line.c b/buffyboard/command_line.c
index 58abf58..8f51ffd 100644
--- a/buffyboard/command_line.c
+++ b/buffyboard/command_line.c
@@ -57,8 +57,8 @@ static void print_usage() {
" -C, --config-override Path to a config override file. Can be supplied\n"
" multiple times. Config files are merged in the\n"
" following order:\n"
- " * /usr/share/buffyboard.conf\n"
- " * /usr/share/buffyboard.conf.d/* (alphabetically)\n"
+ " * /usr/share/buffyboard/buffyboard.conf\n"
+ " * /usr/share/buffyboard/buffyboard.conf.d/* (alphabetically)\n"
" * /etc/buffyboard.conf\n"
" * /etc/buffyboard.conf.d/* (alphabetically)\n"
" * Override files (in supplied order)\n"
diff --git a/buffyboard/doc/buffyboard.1.scd b/buffyboard/doc/buffyboard.1.scd
index a37957f..dac7662 100644
--- a/buffyboard/doc/buffyboard.1.scd
+++ b/buffyboard/doc/buffyboard.1.scd
@@ -27,8 +27,8 @@ result.
*-C, --config-override*
Path to a config override file. Can be supplied multiple times. Config
files are merged in the following order:
- - /usr/share/buffyboard.conf
- - /usr/share/buffyboard.conf.d/\* (alphabetically)
+ - /usr/share/buffyboard/buffyboard.conf
+ - /usr/share/buffyboard/buffyboard.conf.d/\* (alphabetically)
- /etc/buffyboard.conf
- /etc/buffyboard.conf.d/\* (alphabetically)
- Override files (in supplied order)
diff --git a/buffyboard/doc/buffyboard.conf.5.scd b/buffyboard/doc/buffyboard.conf.5.scd
index b16a529..7af9d37 100644
--- a/buffyboard/doc/buffyboard.conf.5.scd
+++ b/buffyboard/doc/buffyboard.conf.5.scd
@@ -17,8 +17,8 @@ one option/value pair per line:
On launch, BUFFYBOARD searches for configuration files in various locations and
successively merges all files together into a single configuration. Files are searched
for and, if found, merged in the following order:
- - /usr/share/buffyboard.conf
- - /usr/share/buffyboard.conf.d/ (alphabetically)
+ - /usr/share/buffyboard/buffyboard.conf
+ - /usr/share/buffyboard/buffyboard.conf.d/ (alphabetically)
- /etc/buffyboard.conf
- /etc/buffyboard.conf.d/ (alphabetically)
- Override files (in supplied order)
diff --git a/buffyboard/main.c b/buffyboard/main.c
index d734f93..26054f3 100644
--- a/buffyboard/main.c
+++ b/buffyboard/main.c
@@ -188,8 +188,8 @@ int main(int argc, char *argv[]) {
/* Parse config files */
bb_config_init_opts(&conf_opts);
- bb_config_parse_file("/usr/share/buffyboard.conf", &conf_opts);
- bb_config_parse_directory("/usr/share/buffyboard.conf.d", &conf_opts);
+ bb_config_parse_file("/usr/share/buffyboard/buffyboard.conf", &conf_opts);
+ bb_config_parse_directory("/usr/share/buffyboard/buffyboard.conf.d", &conf_opts);
bb_config_parse_file("/etc/buffyboard.conf", &conf_opts);
bb_config_parse_directory("/etc/buffyboard.conf.d", &conf_opts);
bb_config_parse_files(cli_opts.config_files, cli_opts.num_config_files, &conf_opts);
diff --git a/unl0kr/README.md b/unl0kr/README.md
index e898c41..09eaae7 100644
--- a/unl0kr/README.md
+++ b/unl0kr/README.md
@@ -52,8 +52,8 @@ Mandatory arguments to long options are mandatory for short options too.
-C, --config-override Path to a config override file. Can be supplied
multiple times. Config files are merged in the
following order:
- * /usr/share/unl0kr.conf
- * /usr/share/unl0kr.conf.d/* (alphabetically)
+ * /usr/share/unl0kr/unl0kr.conf
+ * /usr/share/unl0kr/unl0kr.conf.d/* (alphabetically)
* /etc/unl0kr.conf
* /etc/unl0kr.conf.d/* (alphabetically)
* Override files (in supplied order)
diff --git a/unl0kr/command_line.c b/unl0kr/command_line.c
index 2a762a4..df8e6f6 100644
--- a/unl0kr/command_line.c
+++ b/unl0kr/command_line.c
@@ -59,8 +59,8 @@ static void print_usage() {
" -C, --config-override Path to a config override file. Can be supplied\n"
" multiple times. Config files are merged in the\n"
" following order:\n"
- " * /usr/share/unl0kr.conf\n"
- " * /usr/share/unl0kr.conf.d/* (alphabetically)\n"
+ " * /usr/share/unl0kr/unl0kr.conf\n"
+ " * /usr/share/unl0kr/unl0kr.conf.d/* (alphabetically)\n"
" * /etc/unl0kr.conf\n"
" * /etc/unl0kr.conf.d/* (alphabetically)\n"
" * Override files (in supplied order)\n"
diff --git a/unl0kr/doc/unl0kr.1.scd b/unl0kr/doc/unl0kr.1.scd
index f7557cb..28e76f7 100644
--- a/unl0kr/doc/unl0kr.1.scd
+++ b/unl0kr/doc/unl0kr.1.scd
@@ -22,10 +22,10 @@ password is printed to STDOUT. All other output happens on STDERR.
## Optional
*-C, --config-override*
- Path to a config override file. Can be supplied multiple times. Config
+ Path to a config override file. Can be supplied multiple times. Config
files are merged in the following order:
- - /usr/share/unl0kr.conf
- - /usr/share/unl0kr.conf.d/\* (alphabetically)
+ - /usr/share/unl0kr/unl0kr.conf
+ - /usr/share/unl0kr/unl0kr.conf.d/\* (alphabetically)
- /etc/unl0kr.conf
- /etc/unl0kr.conf.d/\* (alphabetically)
- Override files (in supplied order)
diff --git a/unl0kr/doc/unl0kr.conf.5.scd b/unl0kr/doc/unl0kr.conf.5.scd
index 7608d25..25492dc 100644
--- a/unl0kr/doc/unl0kr.conf.5.scd
+++ b/unl0kr/doc/unl0kr.conf.5.scd
@@ -17,8 +17,8 @@ one option/value pair per line:
On launch, UNL0KR searches for configuration files in various locations and
successively merges all files together into a single configuration. Files are searched
for and, if found, merged in the following order:
- - /usr/share/unl0kr.conf
- - /usr/share/unl0kr.conf.d/ (alphabetically)
+ - /usr/share/unl0kr/unl0kr.conf
+ - /usr/share/unl0kr/unl0kr.conf.d/ (alphabetically)
- /etc/unl0kr.conf
- /etc/unl0kr.conf.d/ (alphabetically)
- Override files (in supplied order)
diff --git a/unl0kr/main.c b/unl0kr/main.c
index 58c5133..2742ef0 100644
--- a/unl0kr/main.c
+++ b/unl0kr/main.c
@@ -381,8 +381,8 @@ int main(int argc, char *argv[]) {
/* Parse config files */
ul_config_init_opts(&conf_opts);
- ul_config_parse_file("/usr/share/unl0kr.conf", &conf_opts);
- ul_config_parse_directory("/usr/share/unl0kr.conf.d", &conf_opts);
+ ul_config_parse_file("/usr/share/unl0kr/unl0kr.conf", &conf_opts);
+ ul_config_parse_directory("/usr/share/unl0kr/unl0kr.conf.d", &conf_opts);
ul_config_parse_file("/etc/unl0kr.conf", &conf_opts);
ul_config_parse_directory("/etc/unl0kr.conf.d", &conf_opts);
ul_config_parse_files(cli_opts.config_files, cli_opts.num_config_files, &conf_opts);
--
GitLab