From 7f927fb99c4ddaf3b2d9b78affba897c3cb25c47 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 10 May 2015 19:41:32 +0300
Subject: [PATCH] No more CURATOR_DIR

---
 automated/build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/automated/build.sh b/automated/build.sh
index 21abf2e5..98e882a8 100755
--- a/automated/build.sh
+++ b/automated/build.sh
@@ -11,7 +11,6 @@ BUNDLE_FILE=current.bundle
 
 CABAL_DIR=$ROOT/cabal
 GHC_DIR=$ROOT/ghc
-CURATOR_DIR=$ROOT/stackage-curator
 DOT_STACKAGE_DIR=$ROOT/dot-stackage
 WORKDIR=$TROOT/work
 SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
@@ -19,7 +18,6 @@ SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
 mkdir -p \
 	"$CABAL_DIR" \
 	"$GHC_DIR" \
-	"$CURATOR_DIR" \
 	"$DOT_STACKAGE_DIR" \
 	"$WORKDIR" \
 	"$SSH_DIR"
@@ -66,7 +64,7 @@ chmod +x stackage-curator
 ARGS_COMMON="--rm -u $USER -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/local/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro"
 ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage"
 ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro"
-ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro"
+ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro"
 
 # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
 docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"