Skip to content

Commit 290cb2f

Browse files
fanquakefanquake
committed
Merge bitcoin#35775: scripted-diff: Use C.UTF-8 locale in Guix scripts
2cb3bfa scripted-diff: Use long form of shell options in Guix scripts (Hennadii Stepanov) 711eb10 guix: Add copyright headers to Guix scripts (Hennadii Stepanov) 80f8314 guix: Fix `glibc` version in comment (Hennadii Stepanov) 8916f79 scripted-diff: Use C.UTF-8 locale in Guix scripts (Hennadii Stepanov) Pull request description: The C.UTF-8 locale is set by default in `guix shell`, and there is no reason to avoid it nowadays. This PR also silences superfluous warnings from Qt tools, making build logs cleaner and other issues easier to spot. For example: ``` Detected locale "C" with character encoding "ANSI_X3.4-1968", which is not UTF-8. Qt depends on a UTF-8 locale, and has switched to "C.UTF-8" instead. If this causes problems, reconfigure your locale. See the locale(1) manual for more information. ``` Locales in the `guix-*` launch scripts have been updated as well for consistency with the rest of the codebase. Additionally, the headers of the Guix scripts have been adjusted for [uniformity](bitcoin#35775 (comment)). ACKs for top commit: fanquake: ACK 2cb3bfa Tree-SHA512: 9e21d4ad50f5d583efdd8f79d9f96d45a92f1982ea3a422565bceea38aa50bbd9a9360972b37a1b49907e67523d68f3d1f889cb26179ce735453eb4fae4d3fa4
2 parents d472a77 + 2cb3bfa commit 290cb2f

16 files changed

Lines changed: 42 additions & 24 deletions

‎contrib/guix/guix-attest‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/usr/bin/env bash
2-
export LC_ALL=C
3-
set -e -o pipefail
2+
# Copyright (c) The Bitcoin Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or https://opensource.org/license/mit.
5+
export LC_ALL=C.UTF-8
6+
set -o errexit -o pipefail
47

58
# Source the common prelude, which:
69
# 1. Checks if we're at the top directory of the Bitcoin Core repository

‎contrib/guix/guix-build‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/usr/bin/env bash
2-
export LC_ALL=C
2+
# Copyright (c) The Bitcoin Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or https://opensource.org/license/mit.
5+
export LC_ALL=C.UTF-8
36
set -o errexit -o pipefail
47

58
# Source the common prelude, which:

‎contrib/guix/guix-clean‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/usr/bin/env bash
2-
export LC_ALL=C
3-
set -e -o pipefail
2+
# Copyright (c) The Bitcoin Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or https://opensource.org/license/mit.
5+
export LC_ALL=C.UTF-8
6+
set -o errexit -o pipefail
47

58
# Source the common prelude, which:
69
# 1. Checks if we're at the top directory of the Bitcoin Core repository

‎contrib/guix/guix-codesign‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/usr/bin/env bash
2-
export LC_ALL=C
3-
set -e -o pipefail
2+
# Copyright (c) The Bitcoin Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or https://opensource.org/license/mit.
5+
export LC_ALL=C.UTF-8
6+
set -o errexit -o pipefail
47

58
# Source the common prelude, which:
69
# 1. Checks if we're at the top directory of the Bitcoin Core repository

‎contrib/guix/guix-verify‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/usr/bin/env bash
2-
export LC_ALL=C
3-
set -e -o pipefail
2+
# Copyright (c) The Bitcoin Core developers
3+
# Distributed under the MIT software license, see the accompanying
4+
# file COPYING or https://opensource.org/license/mit.
5+
export LC_ALL=C.UTF-8
6+
set -o errexit -o pipefail
47

58
# Source the common prelude, which:
69
# 1. Checks if we're at the top directory of the Bitcoin Core repository

‎contrib/guix/libexec/build_linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or https://opensource.org/license/mit.
5-
export LC_ALL=C
5+
export LC_ALL=C.UTF-8
66
set -o errexit -o pipefail
77

88
# shellcheck source=setup.sh

‎contrib/guix/libexec/build_linux_gui.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or https://opensource.org/license/mit.
5-
export LC_ALL=C
5+
export LC_ALL=C.UTF-8
66
set -o errexit -o pipefail
77

88
# shellcheck source=setup.sh

‎contrib/guix/libexec/build_macos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or https://opensource.org/license/mit.
5-
export LC_ALL=C
5+
export LC_ALL=C.UTF-8
66
set -o errexit -o pipefail
77

88
# shellcheck source=setup.sh

‎contrib/guix/libexec/build_macos_gui.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or https://opensource.org/license/mit.
5-
export LC_ALL=C
5+
export LC_ALL=C.UTF-8
66
set -o errexit -o pipefail
77

88
# shellcheck source=setup.sh

‎contrib/guix/libexec/build_win.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or https://opensource.org/license/mit.
5-
export LC_ALL=C
5+
export LC_ALL=C.UTF-8
66
set -o errexit -o pipefail
77

88
# shellcheck source=setup.sh

0 commit comments

Comments
 (0)