From ce05b3611754267df48d68726994391889ae0dc6 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Sun, 31 Dec 2017 16:42:39 +0100
Subject: [PATCH] Fix CircleCi DUB config

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

diff --git a/.circleci/run.sh b/.circleci/run.sh
index f917fc985a3..3605276f92d 100755
--- a/.circleci/run.sh
+++ b/.circleci/run.sh
@@ -5,7 +5,7 @@ set -uexo pipefail
 HOST_DMD_VER=2.072.2 # same as in dmd/src/posix.mak
 DSCANNER_DMD_VER=2.077.0 # dscanner needs a more up-to-date version
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
-DUB=${DUB:-$HOME/dlang/dub/dub}
+DUB=${DUB:-dub}
 N=2
 CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
 BUILD="debug"
@@ -127,6 +127,8 @@ coverage()
 # extract publictests and run them independently
 publictests()
 {
+    source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
+
     # checkout a specific version of https://github.com/dlang/tools
     if [ ! -d ../tools ] ; then
         clone https://github.com/dlang/tools.git ../tools master