Merge pull request haskell#203 from jneira/fix-stack-install-targets

Fix install script stack targets
jneira · Jul 15, 2020 · 8d37a64 · 8d37a64
2 parents 35205ee + c2c7080
commit 8d37a64
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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