3 files changed, 53 insertions, 4 deletions
diff --git a/tools/prepare-commit-msg b/tools/prepare-commit-msg
index e103888a..d2f927c0 100755
--- a/tools/prepare-commit-msg
+++ b/tools/prepare-commit-msg
@@ -5,11 +5,17 @@
 
 # Add [ci skip] to the commit message unless there are changes to files
 # that are relevant for testing such as src/*, test/*, ledger3.texi, ...
-function add_ci_skip()
+add_ci_skip ()
 {
   pattern="$1"; shift
+  source="$1"
+
+  # Don't add [ci skip] if it's already in the commit message source
+  grep '\[ci skip\]' "$source" >/dev/null 2>&1
+  [ $? -eq 0 ] && return
+
   if [ $(git diff --cached --name-only | grep --count "$pattern") -eq 0 ]; then
-    tempfile=$(mktemp $0.XXXXXX)
+    tempfile=$(mktemp "${0}.XXXXXX")
     cat - "$1" <<EOF > "$tempfile"
 
 # It seems the changes to be committed are irrelevant for the continuous
@@ -19,9 +25,14 @@ function add_ci_skip()
 # comment or remove the next line.
 [ci skip]
 EOF
-    mv "$tempfile" "$1"
+    mv "$tempfile" "$source"
   fi
 }
 
 ## MAIN
-add_ci_skip '\(^src\|^test\|^doc/ledger3.texi\|^\.travis.yml\|CMakeLists.txt\)' "$@"
+file="$1"
+source="$2"
+
+# Skip merge commits
+[ "$source" = "merge" ] && exit 0
+add_ci_skip '\(^src\|^test\|^doc/ledger3.texi\|^\.travis.yml\|CMakeLists.txt\)' "$file"
diff --git a/tools/travis-before_install.sh b/tools/travis-before_install.sh
new file mode 100755
index 00000000..fe010945
--- /dev/null
+++ b/tools/travis-before_install.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+#set -x
+set -e
+set -o pipefail
+
+if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+  brew update
+fi
+
+if [ -n "${BOOST_VERSION}" ]; then
+  mkdir -p $BOOST_ROOT
+  wget --no-verbose --output-document=- \
+    http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION//./_}.tar.bz2/download \
+    | tar jxf - --strip-components=1 -C "${BOOST_ROOT}"
+fi
diff --git a/tools/travis-install.sh b/tools/travis-install.sh
new file mode 100755
index 00000000..4e8bdc48
--- /dev/null
+++ b/tools/travis-install.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+#set -x
+set -e
+set -o pipefail
+
+if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+  for formula in $(echo "${BREWS//,/ }"); do
+    echo "Checking ${formula} formula"
+    brew outdated "${formula}" \
+      || (brew unlink "${formula}"
+          brew install "${formula}"
+         )
+  done
+fi
+
+if [ -d "${BOOST_ROOT}" ]; then
+  (cd "${BOOST_ROOT}"
+    ./bootstrap.sh --with-libraries="${BOOST_LIBS}"
+    ./b2 threading=multi --prefix="${BOOST_ROOT}" -d0 install
+  )
+fi