From 09e14e552f62fb9210ee7b0a4bc398ccc738a5cf Mon Sep 17 00:00:00 2001 From: ToasterUwU Date: Tue, 27 Feb 2024 21:08:23 +0100 Subject: [PATCH] fix: locales dont always include the utf-8 notation --- pikainstall/debian/changelog | 4 ++-- pikainstall/usr/lib/pika/pikainstall/pikainstall | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pikainstall/debian/changelog b/pikainstall/debian/changelog index 52537f9..1d44377 100644 --- a/pikainstall/debian/changelog +++ b/pikainstall/debian/changelog @@ -1,5 +1,5 @@ -pikainstall (1.1.6-100pika8) pikauwu; urgency=medium +pikainstall (1.1.7-1pika1) pikauwu; urgency=medium - * Initial release. + * (Hopefully) fix a issue with the locales -- Ward Nakchbandi Fri, 07 Oct 2022 23:26:00 +0300 -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 diff --git a/pikainstall/usr/lib/pika/pikainstall/pikainstall b/pikainstall/usr/lib/pika/pikainstall/pikainstall index 8a320a9..11e9390 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pikainstall +++ b/pikainstall/usr/lib/pika/pikainstall/pikainstall @@ -6,7 +6,7 @@ import subprocess import os, errno # Version -version="1.1.6" +version="1.1.7" dist="PikaOS 3" image="/cdrom/casper/filesystem.squashfs" @@ -48,7 +48,7 @@ cp -rvf /key-*.txt {CHROOT_PATH}/ """ _LANG_SETUP_FILE = """#!/usr/bin/bash -update-locale LANG={LOCALE}.UTF-8 +update-locale LANG={LOCALE} touch /etc/default/keyboard echo 'XKBMODEL="pc105"' > /etc/default/keyboard echo 'XKBLAYOUT="{KEYBOARD}"' >> /etc/default/keyboard @@ -57,7 +57,7 @@ echo 'XKBOPTIONS=""' >> /etc/default/keyboard echo 'BACKSPACE="guess"' >> /etc/default/keyboard echo 'KEYMAP={KEYBOARD}' >> /etc/default/keyboard cp -fv /etc/default/keyboard /etc/vconsole.conf -localectl set-locale LANG={LOCALE}.UTF-8 +localectl set-locale LANG={LOCALE} timedatectl set-timezone {TIMEZONE} """