RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from Alexays/system-wide-config 

Add system-wide config and style files
pull/3/head
Alex 2018-08-09 17:14:16 +02:00 committed by GitHub
parent b5bef4386f 22a8427db4
commit a25967e4c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -51,3 +51,9 @@ executable(
include_directories: [include_directories('include')], include_directories: [include_directories('include')],
install: true, install: true,
) )
install_data(
'./resources/config',
'./resources/style.css',
install_dir: '/etc/xdg/waybar',
)

2
src/client.cpp
View File

@ -58,11 +58,13 @@ waybar::Client::Client(int argc, char* argv[])
configFile = getFirstValidPath({ configFile = getFirstValidPath({
"$XDG_CONFIG_HOME/waybar/config", "$XDG_CONFIG_HOME/waybar/config",
"$HOME/waybar/config", "$HOME/waybar/config",
"/etc/xdg/waybar/config",
"./resources/config", "./resources/config",
}); });
cssFile = getFirstValidPath({ cssFile = getFirstValidPath({
"$XDG_CONFIG_HOME/waybar/style.css", "$XDG_CONFIG_HOME/waybar/style.css",
"$HOME/waybar/style.css", "$HOME/waybar/style.css",
"/etc/xdg/waybar/style.css",
"./resources/style.css", "./resources/style.css",
}); });