mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-04-06 07:15:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

添加默认配置到/etc/maomao/config.conf

Browse source
This commit is contained in:
DreamMaoMao 2025-02-23 21:38:32 +08:00
parent b531135211
commit 53bf73d8a2
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -1,5 +1,5 @@
project('maomao', ['c', 'cpp'], project('maomao', ['c', 'cpp'],
version : '0.1.1' version : '0.1.5'
) )
subdir('protocols') subdir('protocols')
@ -71,3 +71,5 @@ executable('maomao',
prefix = get_option('prefix') prefix = get_option('prefix')
desktop_install_dir = join_paths(prefix, 'share/wayland-sessions') desktop_install_dir = join_paths(prefix, 'share/wayland-sessions')
install_data('maomao.desktop', install_dir : desktop_install_dir) install_data('maomao.desktop', install_dir : desktop_install_dir)
install_data('config.conf', install_dir : '/etc/maomao')

7
parse_config.h
View file

@ -1003,6 +1003,12 @@ const char *maomaoconfig = getenv("MAOMAOCONFIG");
} }
// 构建日志文件路径 // 构建日志文件路径
snprintf(filename, sizeof(filename), "%s/.config/maomao/config.conf", homedir); snprintf(filename, sizeof(filename), "%s/.config/maomao/config.conf", homedir);
// 检查文件是否存在
if (access(filename, F_OK) != 0) {
// 如果文件不存在，则使用 /etc/maomao/config.conf
snprintf(filename, sizeof(filename), "/etc/maomao/config.conf");
}
} else { } else {
// 使用 MAOMAOCONFIG 环境变量作为配置文件夹路径 // 使用 MAOMAOCONFIG 环境变量作为配置文件夹路径
snprintf(filename, sizeof(filename), "%s/config.conf", maomaoconfig); snprintf(filename, sizeof(filename), "%s/config.conf", maomaoconfig);
@ -1010,7 +1016,6 @@ const char *maomaoconfig = getenv("MAOMAOCONFIG");
set_value_default(); set_value_default();
parse_config_file(&config, filename); parse_config_file(&config, filename);
override_config(); override_config();
} }