From d7c59dfc4a23d3dd2400a9112a64908136a71260 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Nov 2015 15:07:05 +0900 Subject: [PATCH] build.sh: simplify setup by using $TAG --- automated/build.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 9b7fbc0e..8b9ed5cb 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -7,13 +7,6 @@ TARGET=$1 TAG=$(echo $TARGET | cut -d- -f 1) IMAGE=snoyberg/stackage:$TAG -if [ "$TAG" = "nightly" ] -then - TROOT=$ROOT/nightly -else - TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1) -fi - PLAN_FILE=current-plan.yaml DOCMAP_FILE=current-docmap.yaml BUNDLE_FILE=current.bundle @@ -21,8 +14,8 @@ BUNDLE_FILE=current.bundle CABAL_DIR=$ROOT/cabal GHC_DIR=$ROOT/ghc DOT_STACKAGE_DIR=$ROOT/dot-stackage -WORKDIR=$TROOT/work -SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1) +WORKDIR=$ROOT/$TAG/work +SSH_DIR=$ROOT/ssh-$TAG mkdir -p \ "$CABAL_DIR" \