@@ -7,10 +7,12 @@ TARGET=$1
8# For nightly-YYYY-MM-DD, tag should be nightly
8# For nightly-YYYY-MM-DD, tag should be nightly
9# For lts-X.Y, tag should be ltsX
9# For lts-X.Y, tag should be ltsX
10−TAG=$(echo $TARGET | cut -d- -f 1)
10+SHORTNAME=$(echo $TARGET | cut -d- -f 1)
11−if [ $TAG = "lts" ]
11+if [ $SHORTNAME = "lts" ]
13 TAG=$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts\1@')
13 TAG=$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts\1@')
16IMAGE=snoyberg/stackage:$TAG
18IMAGE=snoyberg/stackage:$TAG
@@ -23,7 +25,7 @@ CABAL_DIR=$ROOT/cabal
23GHC_DIR=$ROOT/ghc
25GHC_DIR=$ROOT/ghc
24DOT_STACKAGE_DIR=$ROOT/dot-stackage
26DOT_STACKAGE_DIR=$ROOT/dot-stackage
25WORKDIR=$ROOT/$TAG/work
27WORKDIR=$ROOT/$TAG/work
26−SSH_DIR=$ROOT/ssh-$TAG
28+SSH_DIR=$ROOT/ssh-$SHORTNAME
29 "$CABAL_DIR" \
31 "$CABAL_DIR" \