[gjs/fix-locale-chooser: 2/2] build: Break output of `locale -a` into lines
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/fix-locale-chooser: 2/2] build: Break output of `locale -a` into lines
- Date: Tue, 23 Jul 2019 20:36:50 +0000 (UTC)
commit 927c947d87140003bfd29366739dc23ae039e00b
Author: Philip Chimento <philip endlessm com>
Date: Tue Jul 23 13:34:43 2019 -0700
build: Break output of `locale -a` into lines
It seems that if there are few locales, `locale -a` will print them all
on one line, which was confusing the matching done in this script using
grep. Instead, make sure to break the output so that there is only one
locale per line.
For context, see failures on GNOME/gjs!312.
build/choose-tests-locale.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/build/choose-tests-locale.sh b/build/choose-tests-locale.sh
index 4d409ebf..ded42b99 100755
--- a/build/choose-tests-locale.sh
+++ b/build/choose-tests-locale.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-locales=$(locale -a)
+locales=$(locale -a | xargs -n1)
case $locales in
# Prefer C.UTF-8 although it is only available with newer libc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]