Merge branch 'master' into default-main

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "scripts"]
+	path = scripts
+	url = git://github.com/yesodweb/scripts.git

README.md

@@ -1,17 +1,17 @@
-A next generation web framework using the Haskell programming language, featuring:
-  
+A next generation web framework using the Haskell programming language, 
+featuring:
+
   * safety & security guaranteed at compile time
   * performance
     * fast, compiled code
     * a greater concurrent load than any other web application server
-  * developer productivity: tools for all your basic web development needs
+  * developer productivity: tools for all your basic web development 
+    needs
 
 ## Learn more: http://yesodweb.com/
 
-
 ## Installation: http://www.yesodweb.com/page/five-minutes
 
-
 ## Create a new project after installing
 
     yesod init
@@ -19,13 +19,18 @@ A next generation web framework using the Haskell programming language, featurin
 
 ## Installing the latest development version from github
 
-Yesod is built upon many smaller packages, all of which can be installed with:
+Yesod is built upon many smaller packages, all of which can be installed 
+with:
 
-    cabal update
+~~~ { .bash }
+cabal update
 
-    REPOS="hamlet persistent wai yesod"
-    for repo in $REPOS
-    do
-      git clone http://github.com/yesodweb/$repo
-      (cd $repo && ./install-all.sh)
-    done
+for repo in hamlet persistent wai yesod; do
+  git clone http://github.com/yesodweb/$repo
+  (
+    cd $repo
+    git submodule update --init
+    ./script/install
+  )
+done
+~~~

install-all.sh

@@ -1,47 +0,0 @@
-#!/bin/bash -e
-
-# allow a CABAL env var to override
-CABAL=${CABAL:-cabal}
-
-# install testing dependencies
-$CABAL install HUnit QuickCheck 'hspec >= 0.6.1 && < 0.7' shelltestrunner
-
-pkgs=( yesod-core
-       yesod-json
-       yesod-static
-       yesod-persistent
-       yesod-newsfeed
-       yesod-form
-       yesod-auth
-       yesod-sitemap
-       yesod
-     )
-
-# install each sub-respository
-for pkg in "${pkgs[@]}"; do
-  echo "Installing $pkg..."
-
-  (
-    cd "./$pkg"
-
-    if [ "$1" = "--clean" ]; then
-      $CABAL clean
-    fi
-
-    if ! $CABAL configure --ghc-options="-Wall -Werror"; then
-      $CABAL install --only-dependencies
-      $CABAL configure --ghc-options="-Wall -Werror"
-    fi
-    $CABAL build
-
-    $CABAL configure --enable-tests 
-    $CABAL build
-    $CABAL test
-
-    $CABAL check
-    if [ "$1" != "--fast" ]; then
-      $CABAL haddock --executables
-    fi
-    ./Setup.lhs install
-  )
-done

scripts

@@ -0,0 +1 @@
+Subproject commit 00e2390f2eb601d869e97fc2838cc17f63f0e343