summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-27 17:05:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-27 17:05:29 -0400
commitaf2e65f1c25b72643dfec6ae2a9284ebeeb70ec5 (patch)
tree0246a2c6e0ef184c310920a4cc5e9e62a56ac0ab /Command
parentece8d76d67e2c22e33963f52a341f4b3a59d3ec4 (diff)
The standalone builds now unset their special path and library path variables before running the system web browser.
Should fix a crash reported on OSX.
Diffstat (limited to 'Command')
-rw-r--r--Command/WebApp.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/WebApp.hs b/Command/WebApp.hs
index a0bd2e7f7..1d97eb304 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -137,9 +137,10 @@ openBrowser cmd htmlshim = go $ maybe runBrowser runCustomBrowser cmd
go a = do
putStrLn ""
putStrLn $ "Launching web browser on " ++ url
- unlessM (a url) $
+ env <- cleanEnvironment
+ unlessM (a url env) $
error $ "failed to start web browser"
- runCustomBrowser c u = boolSystem c [Param u]
+ runCustomBrowser c u = boolSystemEnv c [Param u]
{- web.browser is a generic git config setting for a web browser program -}
webBrowser :: Git.Repo -> Maybe FilePath