From a421d638f37d3f8321152b4929a165912f5c858b Mon Sep 17 00:00:00 2001 From: Rolf Sievers Date: Sun, 7 Dec 2014 15:18:19 +0100 Subject: [PATCH 1/2] Fix issue #884. --- yesod-bin/Scaffolding/Scaffolder.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yesod-bin/Scaffolding/Scaffolder.hs b/yesod-bin/Scaffolding/Scaffolder.hs index 6bdfedb8..0f38fcc4 100644 --- a/yesod-bin/Scaffolding/Scaffolder.hs +++ b/yesod-bin/Scaffolding/Scaffolder.hs @@ -96,4 +96,8 @@ scaffold isBare = do responseBody res $$+- sink Right backend -> runResourceT $ yield (backendBS backend) $$ sink - TLIO.putStr $ LT.replace "PROJECTNAME" (LT.pack project) $ renderTextUrl undefined $(textFile "input/done.cg") + let projectnameReplacer = if isBare + then LT.replace "cd PROJECTNAME && " "" + else LT.replace "PROJECTNAME" (LT.pack project) + + TLIO.putStr $ projectnameReplacer $ renderTextUrl undefined $(textFile "input/done.cg") From 807a446ad766d06d63e6a36b8c3b924ef283012f Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Wed, 10 Dec 2014 15:15:54 -0800 Subject: [PATCH 2/2] remove ./scripts/install reference --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7536fb5a..e126476d 100644 --- a/README.md +++ b/README.md @@ -86,23 +86,18 @@ done ## Building your changes to Yesod -The traditional Yesod stack requires 4 "mega-repos", each with multiple cabal packages. `./script/install` will run tests against each package and install each package. +The traditional Yesod stack requires 4 "mega-repos", each with multiple cabal packages. `cabal-meta install` will install each package. ### install package in all repos ~~~ { .bash } for repo in shakespeare persistent wai yesod; do pushd $repo - ./scripts/install + cabal-meta install popd done ~~~ -### Clean build (sometimes necessary) - -~~~ { .bash } -./scripts/install --clean -~~~ ### Building individual packages