Compare commits

...

2 Commits

Author SHA1 Message Date
Levente Polyak
d146be72a3 Merge branch 'fix/clean-makepkg.conf.d' into 'master'
Draft: fix(arch-nspawn): clean all existing makepkg conf.d files before overriding

See merge request archlinux/devtools!308
2025-08-01 18:38:13 +02:00
Levente Polyak
19728506e3 wip: clean all existing makepkg conf.d files before overriding 2025-02-25 21:41:57 +01:00

View File

@@ -116,6 +116,9 @@ copy_hostconf () {
cp "$makepkg_conf" "$working_dir/etc/makepkg.conf" cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
if [[ -d "${makepkg_conf}.d" ]] && is_globfile "${makepkg_conf}.d"/*.conf; then if [[ -d "${makepkg_conf}.d" ]] && is_globfile "${makepkg_conf}.d"/*.conf; then
mkdir --parents "$working_dir/etc/makepkg.conf.d/" mkdir --parents "$working_dir/etc/makepkg.conf.d/"
if is_globfile "$working_dir/etc/makepkg.conf.d"/*.conf; then
rm --force "$working_dir/etc/makepkg.conf.d"/*.conf
fi
cp "${makepkg_conf}.d/"*.conf "$working_dir/etc/makepkg.conf.d/" cp "${makepkg_conf}.d/"*.conf "$working_dir/etc/makepkg.conf.d/"
fi fi
fi fi