Skip to content
Snippets Groups Projects
Commit dd4905cc authored by Pablo Correa Gomez's avatar Pablo Correa Gomez :beach: Committed by Johannes Marbach
Browse files

Make /usr/share paths comply with FHS

parent e3325b30
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 21 deletions
buffyboard/README.md
+ 2
− 2
View file @ dd4905cc
......@@ -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)
......
buffyboard/command_line.c
+ 2
− 2
View file @ dd4905cc
......@@ -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"
......
buffyboard/doc/buffyboard.1.scd
+ 2
− 2
View file @ dd4905cc
......@@ -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)
......
buffyboard/doc/buffyboard.conf.5.scd
+ 2
− 2
View file @ dd4905cc
......@@ -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)
......
buffyboard/main.c
+ 2
− 2
View file @ dd4905cc
......@@ -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);
......
unl0kr/README.md
+ 2
− 2
View file @ dd4905cc
......@@ -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)
......
unl0kr/command_line.c
+ 2
− 2
View file @ dd4905cc
......@@ -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"
......
unl0kr/doc/unl0kr.1.scd
+ 3
− 3
View file @ dd4905cc
......@@ -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)
......
unl0kr/doc/unl0kr.conf.5.scd
+ 2
− 2
View file @ dd4905cc
......@@ -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)
......
unl0kr/main.c
+ 2
− 2
View file @ dd4905cc
......@@ -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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment