Updates for stack-0.1.5.0

Author: borsboom

Config.hs

@@ -24,7 +24,7 @@ defaultVersion :: Program -> Version
 -- Latest released versions of all
 defaultVersion GHC = "7.10.2"
 defaultVersion Git = "2.4.5.1"
-defaultVersion Stack = "0.1.4.0"
+defaultVersion Stack = "0.1.5.0"
 
 source :: Arch -> Program -> Version -> String
 -- Official GHC release, available in xv and bz2, but the xv one is harder to extract on Windows systems

bin/minghc-post-install.exe.7z

@@ -1,6 +1,7 @@
 -- Note: we should only depend on libraries that ship with GHC for this. No
 -- external dependencies!
 import           Control.Monad                (when)
+import           Data.List                    (concat, isPrefixOf)
 import           Data.Version                 (Version, parseVersion)
 import           Prelude                      (Bool (..), FilePath, elem, error,
                                                filter, fmap, getLine, lines,
@@ -14,7 +15,7 @@ import           System.Directory             (doesFileExist,
 import           System.Environment           (getArgs, getExecutablePath)
 import           System.Exit                  (ExitCode (ExitSuccess))
 import           System.FilePath              (splitExtension, takeDirectory,
-                                               takeExtension, (</>))
+                                               takeExtension, takeFileName, (</>))
 import           System.IO                    (IO, hFlush, stdout)
 import           System.Process               (rawSystem, readProcess)
 import           Text.ParserCombinators.ReadP (readP_to_S)
@@ -58,11 +59,11 @@ un7z destPath sevenz =
     go fp = when (ext `elem` exts) $ do
         putStrLn $ "Decompressing " ++ fp ++ " to " ++ destPath
         ec <- rawSystem sevenz
-            [ "x"
-            , "-o" ++ destPath
-            , "-y"
-            , fp
-            ]
+            (concat [ [ "x"
+                      , "-o" ++ destPath
+                      , "-y"
+                      , fp ]
+                    , [ "stack.exe" | "stack-" `isPrefixOf` (takeFileName fp) ]])
         removeFile fp
         when (ec /= ExitSuccess)
             $ error $ "Could not decompress: " ++ fp