on master help sign in
build.sh: simplify setup by using $TAG
d7c59dfJens Petersen
automated/build.sh+2−9
@@ -7,13 +7,6 @@ TARGET=$1
7TAG=$(echo $TARGET | cut -d- -f 1)
7TAG=$(echo $TARGET | cut -d- -f 1)
8IMAGE=snoyberg/stackage:$TAG
8IMAGE=snoyberg/stackage:$TAG
9
9
10−if [ "$TAG" = "nightly" ]
11−then
12− TROOT=$ROOT/nightly
13−else
14− TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1)
15−fi
16−
17PLAN_FILE=current-plan.yaml
10PLAN_FILE=current-plan.yaml
18DOCMAP_FILE=current-docmap.yaml
11DOCMAP_FILE=current-docmap.yaml
19BUNDLE_FILE=current.bundle
12BUNDLE_FILE=current.bundle
@@ -21,8 +14,8 @@ BUNDLE_FILE=current.bundle
21CABAL_DIR=$ROOT/cabal
14CABAL_DIR=$ROOT/cabal
22GHC_DIR=$ROOT/ghc
15GHC_DIR=$ROOT/ghc
23DOT_STACKAGE_DIR=$ROOT/dot-stackage
16DOT_STACKAGE_DIR=$ROOT/dot-stackage
24−WORKDIR=$TROOT/work
17+WORKDIR=$ROOT/$TAG/work
25−SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
18+SSH_DIR=$ROOT/ssh-$TAG
26
19
27mkdir -p \
20mkdir -p \
28 "$CABAL_DIR" \
21 "$CABAL_DIR" \