From abfb256279451ef63c10e6e2675e04e99f498996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 29 Oct 2020 22:59:42 +0100 Subject: [PATCH] [mkchroot] generate locales only when needed --- bin/mkchroot.in | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/mkchroot.in b/bin/mkchroot.in index 7c7e110..68da8af 100644 --- a/bin/mkchroot.in +++ b/bin/mkchroot.in @@ -115,11 +115,12 @@ if ${build_locales}; then printf '%s.UTF-8 UTF-8\n' en_US > "$working_dir/etc/locale.gen" printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf" printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf" + + chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} \ + ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} \ + ${cache_dir:+-c "$cache_dir"} ${keep_flag}) + + exec chroot-run \ + ${chroot_args[*]} \ + "$working_dir" locale-gen fi - -chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} ${cache_dir:+-c "$cache_dir"} ${keep_flag}) - -exec chroot-run \ - ${chroot_args[*]} \ - "$working_dir" locale-gen -