mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp: check that the shim exists, and restart the assistant if not

Browse source
This commit is contained in:
Joey Hess 2012-07-26 14:26:35 -04:00
parent df00c6166c
commit 860415aa5b
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/WebApp.hs
View file

@ -30,7 +30,9 @@ seek = [withFlag restartOption $ \restart -> withNothing $ start restart]
start :: Bool -> CommandStart start :: Bool -> CommandStart
start restart = notBareRepo $ do start restart = notBareRepo $ do
if restart f <- liftIO . absPath =<< fromRepo gitAnnexHtmlShim
ok <- liftIO $ doesFileExist f
if restart || not ok
then do then do
stopDaemon stopDaemon
void $ liftIO . catchMaybeIO . removeFile void $ liftIO . catchMaybeIO . removeFile
@ -40,7 +42,6 @@ start restart = notBareRepo $ do
r <- checkpid r <- checkpid
when (r == Nothing) $ when (r == Nothing) $
startassistant startassistant
f <- liftIO . absPath =<< fromRepo gitAnnexHtmlShim
let url = "file://" ++ f let url = "file://" ++ f
ifM (liftIO $ runBrowser url) ifM (liftIO $ runBrowser url)
( stop ( stop