untested browser opening on Android

I've found multiple references to using the `am` command from the adb shell
to open a browser. So I assume it also works in a terminal emulator.
This commit is contained in:
Joey Hess 2013-04-18 12:52:55 -04:00
parent b521b64cf4
commit 911506bc93
2 changed files with 13 additions and 6 deletions

View file

@ -150,7 +150,7 @@ firstRun listenhost = do
sendurlback v _origout _origerr url _htmlshim = putMVar v url
openBrowser :: Maybe FilePath -> FilePath -> Maybe Handle -> Maybe Handle -> IO ()
openBrowser cmd htmlshim outh errh = do
openBrowser mcmd htmlshim outh errh = do
hPutStrLn (fromMaybe stdout outh) $ "Launching web browser on " ++ url
environ <- cleanEnvironment
(_, _, _, pid) <- createProcess p
@ -163,7 +163,9 @@ openBrowser cmd htmlshim outh errh = do
hPutStrLn (fromMaybe stderr errh) "failed to start web browser"
where
url = fileUrl htmlshim
p = proc (fromMaybe browserCommand cmd) [htmlshim]
p = case mcmd of
Just cmd -> proc cmd [htmlshim]
Nothing -> browserProc htmlshim
{- web.browser is a generic git config setting for a web browser program -}
webBrowser :: Git.Repo -> Maybe FilePath