diff options
Diffstat (limited to 'Command/WebApp.hs')
| -rw-r--r-- | Command/WebApp.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Command/WebApp.hs b/Command/WebApp.hs index 0a8c62be8..ab2e70025 100644 --- a/Command/WebApp.hs +++ b/Command/WebApp.hs @@ -164,7 +164,7 @@ openBrowser mcmd htmlshim realurl outh errh = do {- The Android app has a menu item that opens this file. -} writeFile "/sdcard/git-annex.home/.git-annex-url" realurl #endif - hPutStrLn (fromMaybe stdout outh) $ "Launching web browser on " ++ url + toconsole $ "Launching web browser on " ++ url hFlush stdout environ <- cleanEnvironment (_, _, _, pid) <- createProcess p @@ -174,11 +174,12 @@ openBrowser mcmd htmlshim realurl outh errh = do } exitcode <- waitForProcess pid unless (exitcode == ExitSuccess) $ do - hPutStrLn (fromMaybe stderr errh) "failed to start web browser" + toconsole "failed to start web browser" #ifdef __ANDROID__ - hPutStrLn (fromMaybe stderr errh) "To open the WebApp, go to the menu and select \"Open WebApp\"" + toconsole "To open the WebApp, go to the menu and select \"Open WebApp\"" #endif where + toconsole = hPutStrLn (fromMaybe stdout outh) p = case mcmd of Just cmd -> proc cmd [htmlshim] Nothing -> browserProc url |