Skip to content

Commit 4143269

Browse files
committed
use export LC_ALL=C.UTF-8
1 parent 728c82d commit 4143269

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ env:
1818
- RUN_FUNCTIONAL_TESTS=true
1919
- RUN_BENCH=false # Set to true for any one job that has debug enabled, to quickly check bench is not crashing or hitting assertions
2020
- DOCKER_NAME_TAG=ubuntu:18.04
21-
- LC_ALL=C.UTF-8
2221
- BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
2322
- CCACHE_SIZE=100M
2423
- CCACHE_TEMPDIR=/tmp/.ccache-temp

.travis/test_03_before_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

7-
export LC_ALL=C
7+
export LC_ALL=C.UTF-8
88

99
PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
1010
export PATH

.travis/test_04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

7-
export LC_ALL=C
7+
export LC_ALL=C.UTF-8
88

99
travis_retry docker pull "$DOCKER_NAME_TAG"
1010
env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env

.travis/test_05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

7-
export LC_ALL=C
7+
export LC_ALL=C.UTF-8
88

99
DOCKER_EXEC echo \> \$HOME/.bitcoin # Make sure default datadir does not exist and is never read by creating a dummy file
1010

.travis/test_06_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

7-
export LC_ALL=C
7+
export LC_ALL=C.UTF-8
88

99
TRAVIS_COMMIT_LOG=$(git log --format=fuller -1)
1010
export TRAVIS_COMMIT_LOG

test/lint/lint-shell-locale.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66
#
77
# Make sure all shell scripts:
8-
# a.) explicitly opt out of locale dependence using "export LC_ALL=C", or
8+
# a.) explicitly opt out of locale dependence using
9+
# "export LC_ALL=C" or "export LC_ALL=C.UTF-8", or
910
# b.) explicitly opt in to locale dependence using the annotation below.
1011

1112
export LC_ALL=C
@@ -16,7 +17,7 @@ for SHELL_SCRIPT in $(git ls-files -- "*.sh" | grep -vE "src/(secp256k1|univalue
1617
continue
1718
fi
1819
FIRST_NON_COMMENT_LINE=$(grep -vE '^(#.*|)$' "${SHELL_SCRIPT}" | head -1)
19-
if [[ ${FIRST_NON_COMMENT_LINE} != "export LC_ALL=C" ]]; then
20+
if [[ ${FIRST_NON_COMMENT_LINE} != "export LC_ALL=C" && ${FIRST_NON_COMMENT_LINE} != "export LC_ALL=C.UTF-8" ]]; then
2021
echo "Missing \"export LC_ALL=C\" (to avoid locale dependence) as first non-comment non-empty line in ${SHELL_SCRIPT}"
2122
EXIT_CODE=1
2223
fi

0 commit comments

Comments
 (0)