From bcf5c81593f26a253b514224e3326defd6fa0a8d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 31 Jul 2012 16:19:24 -0400
Subject: when run in uninitialized git repo, do firstrun

My $HOME is in git, let's make it work :)
---
 Command/WebApp.hs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Command/WebApp.hs')

diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index a3294911f..e2442c37e 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -16,12 +16,13 @@ import Assistant.Threads.WebApp
 import Utility.WebApp
 import Utility.ThreadScheduler
 import Utility.Daemon (checkDaemon)
+import Init
 import qualified Command.Watch
 
 import Control.Concurrent.STM
 
 def :: [Command]
-def = [oneShot $ noRepo firstRun $
+def = [oneShot $ noRepo firstRun $ dontCheck repoExists $
 	withOptions [Command.Watch.foregroundOption, Command.Watch.stopOption] $
         command "webapp" paramNothing seek "launch webapp"]
 
@@ -34,14 +35,15 @@ start :: Bool -> Bool -> CommandStart
 start foreground stopdaemon = notBareRepo $ do
 	if stopdaemon
 		then stopDaemon
-		else do
+		else ifM (isInitialized) ( go , liftIO firstRun )
+	stop
+	where
+		go = do
 			f <- liftIO . absPath =<< fromRepo gitAnnexHtmlShim
 			ifM (checkpid <&&> checkshim f) $
 				( liftIO $ openBrowser f 
 				, startDaemon True foreground $ Just openBrowser
 				)
-	stop
-	where
 		checkpid = do
 			pidfile <- fromRepo gitAnnexPidFile
 			liftIO $ isJust <$> checkDaemon pidfile
-- 
cgit v1.2.3