nettika/buffybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make /usr/share paths comply with FHS

Browse source
This commit is contained in:
Pablo Correa Gomez 2024-09-24 19:09:53 +00:00 • committed by Johannes Marbach
parent e3325b30bd
commit dd4905ccfb
10 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
unl0kr/README.md
View file

@ -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)

4
unl0kr/command_line.c
View file

@ -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"

6
unl0kr/doc/unl0kr.1.scd
View file

@ -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)

4
unl0kr/doc/unl0kr.conf.5.scd
View file

@ -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)

4
unl0kr/main.c
View file

@ -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);