Merge pull request #51 from classy-giraffe/revert-49-patch-4

Revert "sed changes"
This commit is contained in:
Tommaso Chiti 2022-06-19 10:50:15 +02:00 committed by GitHub
commit cc06f0802f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -211,7 +211,7 @@ locale_selector () {
'') locale="en_US.UTF-8"
info_print "$locale will be the default locale."
return 0;;
'/') sed -E '/^#( +|$)/d;s/^#| *$//g;s/ .*/ (Charset:&)/' /etc/locale.gen | less -M
'/') sed -E '/^# +|^#$/d;s/^#| *$//g;s/ .*/ (Charset:&)/' /etc/locale.gen | less -M
clear
return 1;;
*) if ! grep -q "^#\?$(sed 's/[].*[]/\\&/g' <<< $locale) " /etc/locale.gen; then
@ -363,7 +363,7 @@ info_print "Generating a new fstab."
genfstab -U /mnt >> /mnt/etc/fstab
# Configure selected locale and console keymap
sed -i "/^#$locale /s/^#//" /mnt/etc/locale.gen
sed -i "/^#$locale/s/^#//" /mnt/etc/locale.gen
echo "LANG=$locale" > /mnt/etc/locale.conf
echo "KEYMAP=$kblayout" > /mnt/etc/vconsole.conf