Skip to content

Commit

Permalink
fix warnings in CabalBootstrap module
Browse files Browse the repository at this point in the history
  • Loading branch information
Paczesiowa committed Dec 10, 2013
1 parent 20fe99f commit 441620a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions src/CabalBootstrap.hs
Expand Up @@ -2,7 +2,7 @@ module CabalBootstrap (bootstrapCabal) where

import System.Directory (doesFileExist, createDirectoryIfMissing, getCurrentDirectory, getAppUserDataDirectory, setCurrentDirectory)
import System.FilePath ((</>))
import Network.URI
import Network.URI (URI(..), URIAuth(..))
import Network.HTTP
import Codec.Compression.GZip (decompress)
import qualified Data.ByteString.Lazy as BS
Expand Down Expand Up @@ -123,13 +123,10 @@ bootstrapCabal = do
let pkgDir = cwd </> "cabal-install-bundle-" ++ prettyVersion cibVersion
setup = pkgDir </> "Setup.hs"
liftIO $ setCurrentDirectory pkgDir
_ <- insideProcess "runghc" [ setup
, "configure"
, "--prefix=" ++ prefix
, "--user"
] Nothing
let cabalSetup args = insideProcess "runghc" (setup:args) Nothing
_ <- cabalSetup ["configure", "--prefix=" ++ prefix, "--user"]
debug "Building cabal-install-bundle"
_ <- insideProcess "runghc" [ setup, "build"] Nothing
_ <- cabalSetup ["build"]
debug "Installing cabal-install-bundle"
_ <- insideProcess "runghc" [ setup, "install"] Nothing
_ <- cabalSetup ["install"]
return ()

0 comments on commit 441620a

Please sign in to comment.