Merge branch 'master' of github.com:yesodweb/yesod

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
 

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")