From 3a8cdf9967ec50475524d58bc8aba4ba956e8f80 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 20 Nov 2023 22:36:17 +0800 Subject: [PATCH] Fix opening changelog on windows --- app/ghcup/BrickMain.hs | 19 +++++++++++++------ lib-opt/GHCup/OptParse/ChangeLog.hs | 22 ++++++++++++---------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/ghcup/BrickMain.hs b/app/ghcup/BrickMain.hs index 5f3cc06..83c98aa 100644 --- a/app/ghcup/BrickMain.hs +++ b/app/ghcup/BrickMain.hs @@ -52,6 +52,7 @@ import Haskus.Utils.Variant.Excepts import Prelude hiding ( appendFile ) import System.Exit import System.IO.Unsafe +import System.Process ( system ) import Text.PrettyPrint.HughesPJClass ( prettyShow ) import URI.ByteString @@ -644,12 +645,18 @@ changelog' _ (_, ListResult {..}) = do Nothing -> pure $ Left $ "Could not find ChangeLog for " <> prettyShow lTool <> ", version " <> T.unpack (prettyVer lVer) Just uri -> do - let cmd = case _rPlatform pfreq of - Darwin -> "open" - Linux _ -> "xdg-open" - FreeBSD -> "xdg-open" - Windows -> "start" - exec cmd [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing >>= \case + case _rPlatform pfreq of + Darwin -> exec "open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing + Linux _ -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing + FreeBSD -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing + Windows -> do + let args = "start \"\" " ++ (T.unpack $ decUTF8Safe $ serializeURIRef' uri) + c <- liftIO $ system $ args + case c of + (ExitFailure xi) -> pure $ Left $ NonZeroExit xi "cmd.exe" [args] + ExitSuccess -> pure $ Right () + + >>= \case Right _ -> pure $ Right () Left e -> pure $ Left $ prettyHFError e diff --git a/lib-opt/GHCup/OptParse/ChangeLog.hs b/lib-opt/GHCup/OptParse/ChangeLog.hs index 03e50c4..97bf9d2 100644 --- a/lib-opt/GHCup/OptParse/ChangeLog.hs +++ b/lib-opt/GHCup/OptParse/ChangeLog.hs @@ -29,6 +29,7 @@ import Data.Maybe import Options.Applicative hiding ( style ) import Prelude hiding ( appendFile ) import System.Exit +import System.Process ( system ) import Text.PrettyPrint.HughesPJClass ( prettyShow ) import qualified Data.Text as T @@ -128,21 +129,22 @@ changelog ChangeLogOptions{..} runAppState runLogger = do Just uri -> do pfreq <- runAppState getPlatformReq let uri' = T.unpack . decUTF8Safe . serializeURIRef' $ uri - cmd = case _rPlatform pfreq of - Darwin -> "open" - Linux _ -> "xdg-open" - FreeBSD -> "xdg-open" - Windows -> "start" - if clOpen then do runAppState $ - exec cmd - [T.unpack $ decUTF8Safe $ serializeURIRef' uri] - Nothing - Nothing + case _rPlatform pfreq of + Darwin -> exec "open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing + Linux _ -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing + FreeBSD -> exec "xdg-open" [T.unpack $ decUTF8Safe $ serializeURIRef' uri] Nothing Nothing + Windows -> do + let args = "start \"\" " ++ (T.unpack $ decUTF8Safe $ serializeURIRef' uri) + c <- liftIO $ system $ args + case c of + (ExitFailure xi) -> pure $ Left $ NonZeroExit xi "cmd.exe" [args] + ExitSuccess -> pure $ Right () >>= \case Right _ -> pure ExitSuccess Left e -> logError (T.pack $ prettyHFError e) >> pure (ExitFailure 13) else liftIO $ putStrLn uri' >> pure ExitSuccess +