From c2c70809233acb8c5f00a71aa654bd8265c6d795 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 15 Jul 2020 00:10:48 +0200 Subject: [PATCH] Fix install script stack targets This way we avoid install executables from ghcide or other subpackages --- install/src/Stack.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install/src/Stack.hs b/install/src/Stack.hs index ea566fa483..0d5faac1c0 100644 --- a/install/src/Stack.hs +++ b/install/src/Stack.hs @@ -17,16 +17,17 @@ stackInstallHlsWithErrMsg mbVersionNumber args = -- | copy the built binaries into the localBinDir stackInstallHls :: Maybe VersionNumber -> [String] -> Action () stackInstallHls mbVersionNumber args = do + let args' = [ "install" + , ":haskell-language-server-wrapper" + , ":haskell-language-server" + ] ++ args versionNumber <- case mbVersionNumber of Nothing -> do - execStackWithCfgFile_ "stack.yaml" $ - ["install" - , ":haskell-language-server-wrapper" - , ":haskell-language-server"] ++ args + execStackWithCfgFile_ "stack.yaml" args' getGhcVersionOfCfgFile "stack.yaml" args Just vn -> do - execStackWithGhc_ vn $ ["install"] ++ args + execStackWithGhc_ vn args' return vn localBinDir <- getLocalBin args