forked from mirrored-repos/manjaro-tools
mkchroot: simplify locale handling
This commit is contained in:
parent
2ec2daaf59
commit
9d4bd376dc
3 changed files with 19 additions and 18 deletions
|
@ -109,7 +109,7 @@ basestrap "${basestrap_args[@]}" "$working_dir" ${cache_dirs[@]/#/--cachedir=} "
|
|||
|
||||
echo "$version" > "$working_dir/.manjaro-tools"
|
||||
|
||||
set_locale "$working_dir"
|
||||
default_locale "set" "$working_dir"
|
||||
|
||||
chroot_args=(${pacman_conf:+-C "$pacman_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${cache_dir:+-c "$cache_dir"})
|
||||
${nosetarch} && chroot_args+=(${nosetarch:+-s})
|
||||
|
|
|
@ -44,8 +44,9 @@ subvolume_delete_recursive() {
|
|||
return 0
|
||||
}
|
||||
|
||||
set_locale(){
|
||||
local mnt="$1"
|
||||
default_locale(){
|
||||
local action="$1" mnt="$2"
|
||||
if [[ $action == "set" ]];then
|
||||
if [[ ! -f "$mnt/etc/locale.gen.bak" ]] && [[ ! -f "$mnt/etc/locale.conf.bak" ]];then
|
||||
info "Setting locale ..."
|
||||
mv "$mnt/etc/locale.gen" "$mnt/etc/locale.gen.bak"
|
||||
|
@ -54,13 +55,13 @@ set_locale(){
|
|||
printf 'LANG=%s.UTF-8\n' en_US > "$mnt/etc/locale.conf"
|
||||
printf 'LC_MESSAGES=C\n' >> "$mnt/etc/locale.conf"
|
||||
fi
|
||||
}
|
||||
|
||||
reset_locale(){
|
||||
local mnt="$1"
|
||||
elif [[ $action == "reset" ]];then
|
||||
if [[ -f "$mnt/etc/locale.gen.bak" ]] && [[ -f "$mnt/etc/locale.conf.bak" ]];then
|
||||
info "Resetting locale ..."
|
||||
[[ -f "$mnt/etc/locale.gen.bak" ]] && mv "$mnt/etc/locale.gen.bak" "$mnt/etc/locale.gen"
|
||||
[[ -f "$mnt/etc/locale.conf.bak" ]] && mv "$mnt/etc/locale.conf.bak" "$mnt/etc/locale.conf"
|
||||
mv "$mnt/etc/locale.gen.bak" "$mnt/etc/locale.gen"
|
||||
mv "$mnt/etc/locale.conf.bak" "$mnt/etc/locale.conf"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
create_chroot(){
|
||||
|
|
|
@ -169,7 +169,7 @@ clean_up_image(){
|
|||
find "$path" -mindepth 0 -delete &> /dev/null
|
||||
fi
|
||||
else
|
||||
reset_locale "$mnt"
|
||||
default_locale "reset" "$mnt"
|
||||
path=$mnt/boot
|
||||
if [[ -d "$path" ]]; then
|
||||
find "$path" -name 'initramfs*.img' -delete &> /dev/null
|
||||
|
|
Loading…
Reference in a new issue