From 66d3efdce32109dc94cee392a915b1eb9d60e06a Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Mon, 8 Aug 2016 21:14:04 -0500
Subject: [PATCH] don't skip install phase inside docker

---
 ci/install.sh | 2 +-
 ci/script.sh  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/install.sh b/ci/install.sh
index 80a1023..69f6ebc 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -62,7 +62,7 @@ EOF
 }
 
 main() {
-    if [[ -z $DOCKER ]]; then
+    if [[ ${DOCKER:-n} != "y" ]]; then
         install_qemu
         install_binutils
         install_c_toolchain
diff --git a/ci/script.sh b/ci/script.sh
index 56625fa..4a6dce7 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -39,7 +39,8 @@ main() {
                -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
                -v $(pwd):/mnt \
                ubuntu:16.04 \
-               sh -c 'cd /mnt;
+               sh -c 'set -ex;
+                      cd /mnt;
                       export PATH="$PATH:$HOME/.cargo/bin";
                       bash ci/install.sh;
                       bash ci/script.sh'