From 4f2f88c7b08d3bf724720ae2779fbfc39061643d Mon Sep 17 00:00:00 2001
From: Julian Fleischer <tirednesscankill@warhog.net>
Date: Fri, 3 Aug 2018 15:21:03 +0200
Subject: [PATCH 1/7] move script sections info individual files and comply
 with shellcheck

---
 .travis.yml               | 49 +++-------------------------
 .travis/before_install.sh | 23 ++++++++++++++
 .travis/before_script.sh  | 25 +++++++++++++++
 .travis/install.sh        | 26 +++++++++++++++
 .travis/lint.sh           | 26 +++++++++++++++
 .travis/script.sh         | 67 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 172 insertions(+), 44 deletions(-)
 create mode 100755 .travis/before_install.sh
 create mode 100755 .travis/before_script.sh
 create mode 100755 .travis/install.sh
 create mode 100755 .travis/lint.sh
 create mode 100755 .travis/script.sh

diff --git a/.travis.yml b/.travis.yml
index e6e6d91e30f..4ee73bda9a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,41 +29,13 @@ env:
     - WINEDEBUG=fixme-all
     - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"
 before_install:
-    - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
-    - BEGIN_FOLD () { echo ""; CURRENT_FOLD_NAME=$1; echo "travis_fold:start:${CURRENT_FOLD_NAME}"; }
-    - END_FOLD () { RET=$?; echo "travis_fold:end:${CURRENT_FOLD_NAME}"; return $RET; }
+  - source .travis/before_install.sh
 install:
-    - travis_retry docker pull $DOCKER_NAME_TAG
-    - env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env
-    - if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN"; fi
-    - DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG)
-    - DOCKER_EXEC () { docker exec $DOCKER_ID bash -c "cd $PWD && $*"; }
-    - if [ -n "$DPKG_ADD_ARCH" ]; then DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
-    - travis_retry DOCKER_EXEC apt-get update
-    - travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES
+  - source .travis/install.sh
 before_script:
-    - DOCKER_EXEC echo \> \$HOME/.bitcoin  # Make sure default datadir does not exist and is never read by creating a dummy file
-    - mkdir -p depends/SDKs depends/sdk-sources
-    - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\); fi
-    - if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS; fi
+  - source .travis/before_script.sh
 script:
-    - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
-    - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
-    - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
-    - if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC ccache --max-size=$CCACHE_SIZE; fi
-    - BEGIN_FOLD autogen; test -n "$CONFIG_SHELL" && DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh" || DOCKER_EXEC ./autogen.sh; END_FOLD
-    - mkdir build && cd build
-    - BEGIN_FOLD configure; DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD
-    - BEGIN_FOLD distdir; DOCKER_EXEC make distdir VERSION=$HOST; END_FOLD
-    - cd bitcoin-$HOST
-    - BEGIN_FOLD configure; DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD
-    - BEGIN_FOLD build; DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ); END_FOLD
-    - if [ "$RUN_UNIT_TESTS" = "true" ]; then BEGIN_FOLD unit-tests; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1; END_FOLD; fi
-    - if [ "$RUN_BENCH" = "true" ]; then BEGIN_FOLD bench; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_bitcoin -scaling=0.001 ; END_FOLD; fi
-    - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi
-    - if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then BEGIN_FOLD functional-tests; DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}; END_FOLD; fi
+  - source .travis/script.sh
 after_script:
     - echo $TRAVIS_COMMIT_RANGE
     - echo $TRAVIS_COMMIT_LOG
@@ -160,15 +132,4 @@ jobs:
       before_script:
         - git fetch --unshallow
       script:
-        - if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi
-        - test/lint/git-subtree-check.sh src/crypto/ctaes
-        - test/lint/git-subtree-check.sh src/secp256k1
-        - test/lint/git-subtree-check.sh src/univalue
-        - test/lint/git-subtree-check.sh src/leveldb
-        - test/lint/check-doc.py
-        - test/lint/check-rpc-mappings.py .
-        - test/lint/lint-all.sh
-        - if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
-              while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
-              travis_wait 50 contrib/verify-commits/verify-commits.py;
-          fi
+        - source .travis/lint.sh
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
new file mode 100755
index 00000000000..800d490abb2
--- /dev/null
+++ b/.travis/before_install.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C
+
+PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
+export PATH
+
+BEGIN_FOLD () {
+  echo ""
+  CURRENT_FOLD_NAME=$1
+  echo "travis_fold:start:${CURRENT_FOLD_NAME}"
+}
+
+END_FOLD () {
+  RET=$?
+  echo "travis_fold:end:${CURRENT_FOLD_NAME}"
+  return $RET
+}
+
diff --git a/.travis/before_script.sh b/.travis/before_script.sh
new file mode 100755
index 00000000000..eeeceed57d3
--- /dev/null
+++ b/.travis/before_script.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C
+
+DOCKER_EXEC echo \> \$HOME/.bitcoin  # Make sure default datadir does not exist and is never read by creating a dummy file
+
+mkdir -p depends/SDKs depends/sdk-sources
+
+if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
+  curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
+fi
+if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then
+  tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz
+fi
+if [[ $HOST = *-mingw32 ]]; then
+  DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\)
+fi
+if [ -z "$NO_DEPENDS" ]; then
+  DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
+fi
+
diff --git a/.travis/install.sh b/.travis/install.sh
new file mode 100755
index 00000000000..aa47dfccb43
--- /dev/null
+++ b/.travis/install.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C
+
+travis_retry docker pull "$DOCKER_NAME_TAG"
+env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env
+if [[ $HOST = *-mingw32 ]]; then
+  DOCKER_ADMIN="--cap-add SYS_ADMIN"
+fi
+DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG)
+
+DOCKER_EXEC () {
+  docker exec $DOCKER_ID bash -c "cd $PWD && $*"
+}
+
+if [ -n "$DPKG_ADD_ARCH" ]; then
+  DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
+fi
+
+travis_retry DOCKER_EXEC apt-get update
+travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES
+
diff --git a/.travis/lint.sh b/.travis/lint.sh
new file mode 100755
index 00000000000..067ad6c32ae
--- /dev/null
+++ b/.travis/lint.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# Check for new lines in diff that introduce trailing whitespace.
+
+export LC_ALL=C
+
+if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
+  test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE
+fi
+
+test/lint/git-subtree-check.sh src/crypto/ctaes
+test/lint/git-subtree-check.sh src/secp256k1
+test/lint/git-subtree-check.sh src/univalue
+test/lint/git-subtree-check.sh src/leveldb
+test/lint/check-doc.py
+test/lint/check-rpc-mappings.py .
+test/lint/lint-all.sh
+
+if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
+    while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
+    travis_wait 50 contrib/verify-commits/verify-commits.py;
+fi
diff --git a/.travis/script.sh b/.travis/script.sh
new file mode 100755
index 00000000000..30096eff8a9
--- /dev/null
+++ b/.travis/script.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C
+
+TRAVIS_COMMIT_LOG=$(git log --format=fuller -1)
+export TRAVIS_COMMIT_LOG
+
+OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
+BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
+if [ -z "$NO_DEPENDS" ]; then
+  DOCKER_EXEC ccache --max-size=$CCACHE_SIZE
+fi
+
+BEGIN_FOLD autogen
+if [ -n "$CONFIG_SHELL" ]; then
+  DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh"
+else
+  DOCKER_EXEC ./autogen.sh
+fi
+END_FOLD
+
+mkdir build
+cd build || (echo "could not enter build directory"; exit 1)
+
+BEGIN_FOLD configure
+DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+END_FOLD
+
+BEGIN_FOLD distdir
+DOCKER_EXEC make distdir VERSION=$HOST
+END_FOLD
+
+cd "bitcoin-$HOST" || (echo "could not enter distdir bitcoin-$HOST"; exit 1)
+
+BEGIN_FOLD configure
+DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
+END_FOLD
+
+BEGIN_FOLD build
+DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
+END_FOLD
+
+if [ "$RUN_TESTS" = "true" ]; then
+  BEGIN_FOLD unit-tests
+  DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1
+  END_FOLD
+fi
+
+if [ "$RUN_BENCH" = "true" ]; then
+  BEGIN_FOLD bench
+  DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_bitcoin -scaling=0.001
+  END_FOLD
+fi
+
+if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
+  extended="--extended --exclude feature_pruning,feature_dbcrash"
+fi
+
+if [ "$RUN_TESTS" = "true" ]; then
+  BEGIN_FOLD functional-tests
+  DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}
+  END_FOLD
+fi

From 86d34f0e657e039843ff264358e77ffb2763803f Mon Sep 17 00:00:00 2001
From: Julian Fleischer <tirednesscankill@warhog.net>
Date: Fri, 3 Aug 2018 16:07:53 +0200
Subject: [PATCH 2/7] abort script in END_FOLD on non-zero exit code

---
 .travis/before_install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 800d490abb2..8026a96f896 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -18,6 +18,8 @@ BEGIN_FOLD () {
 END_FOLD () {
   RET=$?
   echo "travis_fold:end:${CURRENT_FOLD_NAME}"
-  return $RET
+  if [ $RET != 0 ]; then
+    echo "${CURRENT_FOLD_NAME} failed with status code ${RET}"
+  fi
 }
 

From 519e2739cf6fac98ec24888b36b011f1c6b98bbc Mon Sep 17 00:00:00 2001
From: Julian Fleischer <tirednesscankill@warhog.net>
Date: Fri, 3 Aug 2018 15:39:05 +0200
Subject: [PATCH 3/7] move lint stage up to resemble travis build ui

adjust indentation to 2 spaces
---
 .travis.yml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ee73bda9a7..d2084f2d5c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ language: minimal
 cache:
   ccache: true
   directories:
-  - depends/built
-  - depends/sdk-sources
-  - $HOME/.ccache
+    - depends/built
+    - depends/sdk-sources
+    - $HOME/.ccache
 stages:
   - lint
   - test
@@ -37,10 +37,23 @@ before_script:
 script:
   - source .travis/script.sh
 after_script:
-    - echo $TRAVIS_COMMIT_RANGE
-    - echo $TRAVIS_COMMIT_LOG
+  - echo $TRAVIS_COMMIT_RANGE
+  - echo $TRAVIS_COMMIT_LOG
 jobs:
   include:
+# lint stage
+    - stage: lint
+      env:
+      sudo: false
+      cache: false
+      language: python
+      python: '3.6'
+      install:
+        - travis_retry pip install flake8
+      before_script:
+        - git fetch --unshallow
+      script:
+        - source .travis/lint.sh
 # ARM
     - stage: test
       env: >-
@@ -121,15 +134,3 @@ jobs:
         RUN_FUNCTIONAL_TESTS=false
         GOAL="all deploy"
         BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"
-    - stage: lint
-      env:
-      sudo: false
-      cache: false
-      language: python
-      python: '3.6'
-      install:
-        - travis_retry pip install flake8
-      before_script:
-        - git fetch --unshallow
-      script:
-        - source .travis/lint.sh

From 272306ea57116c0c9afc0f73161929be978fe9a8 Mon Sep 17 00:00:00 2001
From: Julian Fleischer <tirednesscankill@warhog.net>
Date: Fri, 3 Aug 2018 17:27:08 +0200
Subject: [PATCH 4/7] number .travis/ script according to build lifecycle and
 add README to explain

---
 .travis.yml                                            | 10 +++++-----
 .travis/README.md                                      |  8 ++++++++
 .travis/{lint.sh => lint_06_script.sh}                 |  0
 .../{before_install.sh => test_03_before_install.sh}   |  0
 .travis/{install.sh => test_04_install.sh}             |  0
 .travis/{before_script.sh => test_05_before_script.sh} |  0
 .travis/{script.sh => test_06_script.sh}               |  0
 7 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 .travis/README.md
 rename .travis/{lint.sh => lint_06_script.sh} (100%)
 rename .travis/{before_install.sh => test_03_before_install.sh} (100%)
 rename .travis/{install.sh => test_04_install.sh} (100%)
 rename .travis/{before_script.sh => test_05_before_script.sh} (100%)
 rename .travis/{script.sh => test_06_script.sh} (100%)

diff --git a/.travis.yml b/.travis.yml
index d2084f2d5c3..de805bda24a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,13 +29,13 @@ env:
     - WINEDEBUG=fixme-all
     - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"
 before_install:
-  - source .travis/before_install.sh
+  - source .travis/test_03_before_install.sh
 install:
-  - source .travis/install.sh
+  - source .travis/test_04_install.sh
 before_script:
-  - source .travis/before_script.sh
+  - source .travis/test_05_before_script.sh
 script:
-  - source .travis/script.sh
+  - source .travis/test_06_script.sh
 after_script:
   - echo $TRAVIS_COMMIT_RANGE
   - echo $TRAVIS_COMMIT_LOG
@@ -53,7 +53,7 @@ jobs:
       before_script:
         - git fetch --unshallow
       script:
-        - source .travis/lint.sh
+        - source .travis/lint_06_script.sh
 # ARM
     - stage: test
       env: >-
diff --git a/.travis/README.md b/.travis/README.md
new file mode 100644
index 00000000000..21d1b9cc03a
--- /dev/null
+++ b/.travis/README.md
@@ -0,0 +1,8 @@
+## travis build scripts
+
+The `.travis` directory contains scripts for each build step in each build stage.
+Currently the travis build defines two stages `lint` and `test`. Each stage has
+it's own [lifecycle](https://docs.travis-ci.com/user/customizing-the-build/#the-build-lifecycle).
+Every script in here is named and numbered according to which stage and lifecycle
+step it belongs to.
+
diff --git a/.travis/lint.sh b/.travis/lint_06_script.sh
similarity index 100%
rename from .travis/lint.sh
rename to .travis/lint_06_script.sh
diff --git a/.travis/before_install.sh b/.travis/test_03_before_install.sh
similarity index 100%
rename from .travis/before_install.sh
rename to .travis/test_03_before_install.sh
diff --git a/.travis/install.sh b/.travis/test_04_install.sh
similarity index 100%
rename from .travis/install.sh
rename to .travis/test_04_install.sh
diff --git a/.travis/before_script.sh b/.travis/test_05_before_script.sh
similarity index 100%
rename from .travis/before_script.sh
rename to .travis/test_05_before_script.sh
diff --git a/.travis/script.sh b/.travis/test_06_script.sh
similarity index 100%
rename from .travis/script.sh
rename to .travis/test_06_script.sh

From 506890b24d19c6d1d83fe4b0e0652632db03f999 Mon Sep 17 00:00:00 2001
From: Julian Fleischer <tirednesscankill@warhog.net>
Date: Fri, 3 Aug 2018 17:34:25 +0200
Subject: [PATCH 5/7] move remaining travis build steps into individual files

---
 .travis.yml                      | 4 ++--
 .travis/lint_04_install.sh       | 9 +++++++++
 .travis/lint_05_before_script.sh | 9 +++++++++
 .travis/lint_06_script.sh        | 2 --
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100755 .travis/lint_04_install.sh
 create mode 100755 .travis/lint_05_before_script.sh

diff --git a/.travis.yml b/.travis.yml
index de805bda24a..8de437f6fd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,9 +49,9 @@ jobs:
       language: python
       python: '3.6'
       install:
-        - travis_retry pip install flake8
+        - source .travis/lint_04_install.sh
       before_script:
-        - git fetch --unshallow
+        - source .travis/lint_05_before_script.sh
       script:
         - source .travis/lint_06_script.sh
 # ARM
diff --git a/.travis/lint_04_install.sh b/.travis/lint_04_install.sh
new file mode 100755
index 00000000000..34118a57c34
--- /dev/null
+++ b/.travis/lint_04_install.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C
+
+travis_retry pip install flake8
diff --git a/.travis/lint_05_before_script.sh b/.travis/lint_05_before_script.sh
new file mode 100755
index 00000000000..28bcbb47f74
--- /dev/null
+++ b/.travis/lint_05_before_script.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C
+
+git fetch --unshallow
diff --git a/.travis/lint_06_script.sh b/.travis/lint_06_script.sh
index 067ad6c32ae..6191d825716 100755
--- a/.travis/lint_06_script.sh
+++ b/.travis/lint_06_script.sh
@@ -3,8 +3,6 @@
 # Copyright (c) 2018 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-# Check for new lines in diff that introduce trailing whitespace.
 
 export LC_ALL=C
 

From 728c82d029fc477ff3cb2681730ed57809cdc981 Mon Sep 17 00:00:00 2001
From: Julian Fleischer <tirednesscankill@warhog.net>
Date: Fri, 3 Aug 2018 18:05:22 +0200
Subject: [PATCH 6/7] make script exit if a command fails

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8de437f6fd8..102fa9202cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,13 +29,13 @@ env:
     - WINEDEBUG=fixme-all
     - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"
 before_install:
-  - source .travis/test_03_before_install.sh
+  - set -o errexit; source .travis/test_03_before_install.sh
 install:
-  - source .travis/test_04_install.sh
+  - set -o errexit; source .travis/test_04_install.sh
 before_script:
-  - source .travis/test_05_before_script.sh
+  - set -o errexit; source .travis/test_05_before_script.sh
 script:
-  - source .travis/test_06_script.sh
+  - set -o errexit; source .travis/test_06_script.sh
 after_script:
   - echo $TRAVIS_COMMIT_RANGE
   - echo $TRAVIS_COMMIT_LOG
@@ -49,11 +49,11 @@ jobs:
       language: python
       python: '3.6'
       install:
-        - source .travis/lint_04_install.sh
+        - set -o errexit; source .travis/lint_04_install.sh
       before_script:
-        - source .travis/lint_05_before_script.sh
+        - set -o errexit; source .travis/lint_05_before_script.sh
       script:
-        - source .travis/lint_06_script.sh
+        - set -o errexit; source .travis/lint_06_script.sh
 # ARM
     - stage: test
       env: >-

From 414326952cd6086ebc491413e8cf58a60ad857a4 Mon Sep 17 00:00:00 2001
From: Julian Fleischer <tirednesscankill@warhog.net>
Date: Tue, 7 Aug 2018 11:50:05 +0200
Subject: [PATCH 7/7] use export LC_ALL=C.UTF-8

---
 .travis.yml                       | 1 -
 .travis/test_03_before_install.sh | 2 +-
 .travis/test_04_install.sh        | 2 +-
 .travis/test_05_before_script.sh  | 2 +-
 .travis/test_06_script.sh         | 2 +-
 test/lint/lint-shell-locale.sh    | 5 +++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 102fa9202cd..7e353ad86ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,6 @@ env:
     - RUN_FUNCTIONAL_TESTS=true
     - RUN_BENCH=false  # Set to true for any one job that has debug enabled, to quickly check bench is not crashing or hitting assertions
     - DOCKER_NAME_TAG=ubuntu:18.04
-    - LC_ALL=C.UTF-8
     - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
     - CCACHE_SIZE=100M
     - CCACHE_TEMPDIR=/tmp/.ccache-temp
diff --git a/.travis/test_03_before_install.sh b/.travis/test_03_before_install.sh
index 8026a96f896..d091a67ca93 100755
--- a/.travis/test_03_before_install.sh
+++ b/.travis/test_03_before_install.sh
@@ -4,7 +4,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-export LC_ALL=C
+export LC_ALL=C.UTF-8
 
 PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
 export PATH
diff --git a/.travis/test_04_install.sh b/.travis/test_04_install.sh
index aa47dfccb43..ef595287b71 100755
--- a/.travis/test_04_install.sh
+++ b/.travis/test_04_install.sh
@@ -4,7 +4,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-export LC_ALL=C
+export LC_ALL=C.UTF-8
 
 travis_retry docker pull "$DOCKER_NAME_TAG"
 env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env
diff --git a/.travis/test_05_before_script.sh b/.travis/test_05_before_script.sh
index eeeceed57d3..70caee979c1 100755
--- a/.travis/test_05_before_script.sh
+++ b/.travis/test_05_before_script.sh
@@ -4,7 +4,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-export LC_ALL=C
+export LC_ALL=C.UTF-8
 
 DOCKER_EXEC echo \> \$HOME/.bitcoin  # Make sure default datadir does not exist and is never read by creating a dummy file
 
diff --git a/.travis/test_06_script.sh b/.travis/test_06_script.sh
index 30096eff8a9..dd4633039ce 100755
--- a/.travis/test_06_script.sh
+++ b/.travis/test_06_script.sh
@@ -4,7 +4,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-export LC_ALL=C
+export LC_ALL=C.UTF-8
 
 TRAVIS_COMMIT_LOG=$(git log --format=fuller -1)
 export TRAVIS_COMMIT_LOG
diff --git a/test/lint/lint-shell-locale.sh b/test/lint/lint-shell-locale.sh
index 242b27c7636..efd8081b8c2 100755
--- a/test/lint/lint-shell-locale.sh
+++ b/test/lint/lint-shell-locale.sh
@@ -5,7 +5,8 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 # Make sure all shell scripts:
-# a.) explicitly opt out of locale dependence using "export LC_ALL=C", or
+# a.) explicitly opt out of locale dependence using
+#     "export LC_ALL=C" or "export LC_ALL=C.UTF-8", or
 # b.) explicitly opt in to locale dependence using the annotation below.
 
 export LC_ALL=C
@@ -16,7 +17,7 @@ for SHELL_SCRIPT in $(git ls-files -- "*.sh" | grep -vE "src/(secp256k1|univalue
         continue
     fi
     FIRST_NON_COMMENT_LINE=$(grep -vE '^(#.*|)$' "${SHELL_SCRIPT}" | head -1)
-    if [[ ${FIRST_NON_COMMENT_LINE} != "export LC_ALL=C" ]]; then
+    if [[ ${FIRST_NON_COMMENT_LINE} != "export LC_ALL=C" && ${FIRST_NON_COMMENT_LINE} != "export LC_ALL=C.UTF-8" ]]; then
         echo "Missing \"export LC_ALL=C\" (to avoid locale dependence) as first non-comment non-empty line in ${SHELL_SCRIPT}"
         EXIT_CODE=1
     fi