Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel
This commit is contained in:
commit
cca9044502
2 changed files with 12 additions and 8 deletions
|
@ -85,9 +85,11 @@ basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
|
||||||
echo "$version" > "$working_dir/.manjaro-tools"
|
echo "$version" > "$working_dir/.manjaro-tools"
|
||||||
|
|
||||||
if ${build_locales};then
|
if ${build_locales};then
|
||||||
printf '%s.UTF-8 UTF-8\n en_US.UTF-8 UTF-8\n de_DE.UTF-8 UTF-8\n' > "$working_dir/etc/locale.gen"
|
cp "$working_dir/etc/locale.gen" "$working_dir/etc/locale.gen.bak"
|
||||||
echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
|
cp "$working_dir/etc/locale.conf" "$working_dir/etc/locale.conf.bak"
|
||||||
echo 'LC_MESSAGES=C' >> "$working_dir/etc/locale.conf"
|
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
|
||||||
|
printf '%s.UTF-8' en_US > "$working_dir/etc/locale.conf"
|
||||||
|
printf 'LC_MESSAGES=C' >> "$working_dir/etc/locale.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec chroot-run \
|
exec chroot-run \
|
||||||
|
@ -98,3 +100,8 @@ exec chroot-run \
|
||||||
${cache_dir:+-c "$cache_dir"} \
|
${cache_dir:+-c "$cache_dir"} \
|
||||||
"$working_dir" locale-gen
|
"$working_dir" locale-gen
|
||||||
|
|
||||||
|
if ${build_locales};then
|
||||||
|
cp "$working_dir/etc/locale.gen.bak" "$working_dir/etc/locale.gen"
|
||||||
|
cp "$working_dir/etc/locale.conf.bak" "$working_dir/etc/locale.conf"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ COMPRESSION="xz"
|
||||||
CREATE_DEFAULT=false
|
CREATE_DEFAULT=false
|
||||||
INSTALL_DIR="manjaro"
|
INSTALL_DIR="manjaro"
|
||||||
IMAGE_FOLDER="root-image"
|
IMAGE_FOLDER="root-image"
|
||||||
|
LOCALE=""
|
||||||
APPNAME=$(basename "${0}")
|
APPNAME=$(basename "${0}")
|
||||||
MIRRORS=''
|
MIRRORS=''
|
||||||
|
|
||||||
|
@ -149,7 +150,7 @@ clean_up(){
|
||||||
|
|
||||||
_mkchroot(){
|
_mkchroot(){
|
||||||
#set locale.gen
|
#set locale.gen
|
||||||
if [ "${IMAGE_FOLDER}" == "livecd-image" ]; then
|
if [ "${IMAGE_FOLDER}" == "root-image" ]; then
|
||||||
LOCALE="-L"
|
LOCALE="-L"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -168,10 +169,6 @@ _mkchroot(){
|
||||||
"${work_dir}/${IMAGE_FOLDER}" $@ || die "Failed to retrieve one or more packages!"
|
"${work_dir}/${IMAGE_FOLDER}" $@ || die "Failed to retrieve one or more packages!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if [ -e "${work_dir}/root-image/etc/locale.gen" ]; then
|
|
||||||
# cp ${work_dir}/root-image/etc/locale.gen ${work_dir}/root-image/etc/locale.gen.bak
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
find "${work_dir}" -name *.pacnew -name *.pacsave -name *.pacorig -delete
|
find "${work_dir}" -name *.pacnew -name *.pacsave -name *.pacorig -delete
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue