From fa1a03d420cbafe353e6b0949ffb10ec11225d0c Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 2 Apr 2012 17:24:39 +0300
Subject: [PATCH] Scaffolder: always use App as sitearg

---
 yesod/Scaffolding/Scaffolder.hs | 4 +---
 yesod/input/site-arg.cg         | 5 -----
 yesod/test/mysql-input.txt      | 1 -
 yesod/test/postgresql-input.txt | 1 -
 yesod/test/sqlite-input.txt     | 1 -
 5 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 yesod/input/site-arg.cg

diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs
index 4cec024f..a730b408 100644
--- a/yesod/Scaffolding/Scaffolder.hs
+++ b/yesod/Scaffolding/Scaffolder.hs
@@ -51,9 +51,7 @@ scaffold = do
     project <- prompt $ \s -> all validPN s && not (null s)
     let dir = project
 
-    puts $(codegenDir "input" "site-arg")
-    let isUpperAZ c = 'A' <= c && c <= 'Z'
-    sitearg <- prompt $ \s -> not (null s) && all validPN s && isUpperAZ (head s) && s /= "Main"
+    let sitearg = "App"
 
     puts $(codegenDir "input" "database")
     
diff --git a/yesod/input/site-arg.cg b/yesod/input/site-arg.cg
deleted file mode 100644
index f49604c5..00000000
--- a/yesod/input/site-arg.cg
+++ /dev/null
@@ -1,5 +0,0 @@
-Great, we'll be creating ~project~ today, and placing it in ~dir~.
-What's going to be the name of your foundation datatype? This name must
-start with a capital letter.
-
-Foundation: 
diff --git a/yesod/test/mysql-input.txt b/yesod/test/mysql-input.txt
index 00f93766..6e49d571 100644
--- a/yesod/test/mysql-input.txt
+++ b/yesod/test/mysql-input.txt
@@ -1,4 +1,3 @@
 Michael
 foobar
-Foobar
 mysql
diff --git a/yesod/test/postgresql-input.txt b/yesod/test/postgresql-input.txt
index ad38e160..5689ebb3 100644
--- a/yesod/test/postgresql-input.txt
+++ b/yesod/test/postgresql-input.txt
@@ -1,4 +1,3 @@
 Michael
 foobar
-Foobar
 p
diff --git a/yesod/test/sqlite-input.txt b/yesod/test/sqlite-input.txt
index 6b02a6e9..32257967 100644
--- a/yesod/test/sqlite-input.txt
+++ b/yesod/test/sqlite-input.txt
@@ -1,4 +1,3 @@
 Michael
 foobar
-Foobar
 s