From c9bd01ae902d66acd8647a1cc0167bc0d246cbc8 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 3 Jun 2022 13:29:47 +0200 Subject: meson: Switch default-locale default to C.UTF-8 We're already using C.UTF-8 as the default locale for nspawn. Let's make the same change for the default-locale option instead of deciding what to use based on the locale used by the host system. Users can still override the locale using the default-locale option if needed. --- tools/choose-default-locale.sh | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100755 tools/choose-default-locale.sh (limited to 'tools') diff --git a/tools/choose-default-locale.sh b/tools/choose-default-locale.sh deleted file mode 100755 index a5158cf7c5..0000000000 --- a/tools/choose-default-locale.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: LGPL-2.1-or-later -set -e - -# Fedora uses C.utf8 but Debian uses C.UTF-8 -if locale -a | grep -xq -E 'C\.(utf8|UTF-8)'; then - echo 'C.UTF-8' -elif locale -a | grep -xqF 'en_US.utf8'; then - echo 'en_US.UTF-8' -else - echo 'C' -fi -- cgit v1.2.1