Change config location to /etc/dunst/dunstrc#798
Conversation
|
Weird, this commit doesn't seem to cause the ci failing. My bisect points to 58d215d. Edit: that's only on wayland and is not a problem. I can't find what causes the ci failing. There doesn't seem to be an error message in the ci. |
The CI is failing in the Re: This PR. I'm thinking in Debian terms where it's usual to have docs and example config files in |
Ah thanks. To fix it I need to make sure the config is installed somewhere else when the prefix is changed. Do I need to make a new CONFIG_PREFIX or change PREFIX to
I don't think it's a good idea to place two identical files in different places. Linking them doesn't seem good either. Maybe this is too distro specific. On arch I'm used to the config being something like |
|
Linking or making dunst look in /usr/share/doc isn't going to work in Debian at least as everything in that directory is gzipped. Debian-wise I'd always opt to install the config file in both locations as the The question here is what's best for upstream, default behaviour, does this extend to other distros?
|
Codecov Report
@@ Coverage Diff @@
## master #798 +/- ##
==========================================
- Coverage 59.55% 59.53% -0.03%
==========================================
Files 36 36
Lines 5791 5793 +2
==========================================
Hits 3449 3449
- Misses 2342 2344 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
This page suggests that conffiles should be under /etc for debian. Every other distro I can find installs it's dotfiles in /etc as well.
I think it might be best to install them to
Oh thanks, that's what I was looking for. I changed the test-install script to use that instead of PREFIX. Also made some other improvements to it. |
I guess the divide here is that I view the dunstrc as both a configuration file (which is what this change is about) but also a big part of dunsts limited documentation/examples. Which is why I hesitate moving it entirely off that directory.
That might be a good compromise, my holdout is that Also, don't forget to update the path in dunsts manpage. (We now have 3 active PRs that touch the manpage, I'll probably merge #781 -> #798 -> #799 to have the easiest/least number of conflicts. So the last 2 PRs are blocked on the wayland one). |
71039fb to
4388d0d
Compare
|
I finished this PR and rebased onto the |
Apparently the merge commit confuses it. Both PRs have conflicts. |
No that's because I added some stuff to wayland-2 because of bebehei's comments. I rebased again and fixed the conflicts now. |
|
Could this be reviewed? Then it can be merged together with #799. Otherwise we will stack up conflicts. |
Also fixed the test-install script
|
Yeah I thought so, but didn't know how to fix. I rebased again and it has been cleaned up |
tsipinakis
left a comment
There was a problem hiding this comment.
LGTM.
While reviewing this I couldn't help but think that we should simplify the test-install script to only provide the DESTDIR variable and let everything else be the default. But that's out of scope of this.
I don't think that's better. Setting these variables to some non-default value makes sure you aren't hardcoding the defaults in the makefile. I noticed btw that I didn't update commit message. It should be "Change config location to /etc/dunst/dunstrc". Well I guess it's too late to change it now. |
Fixes #795
The makefile still isn't fully xdg compliant. If the user has set
$XDG_CONFIG_DIRSit should be reflected our install, I believe.I didn't know the best way to implement that, but this is some make documentation about all the standard directories, and this is the spec.