cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid checking build deps if cabal configures ok

This commit is contained in:
Joey Hess 2015-04-29 14:41:46 -04:00
parent 2148a75746
commit 6288393b4b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Propellor/Bootstrap.hs
View File

@ -17,7 +17,7 @@ type ShellCommand = String
-- Should be run inside the propellor config dir, and will install -- Should be run inside the propellor config dir, and will install
-- all necessary build dependencies and build propellor. -- all necessary build dependencies and build propellor.
bootstrapPropellorCommand :: ShellCommand bootstrapPropellorCommand :: ShellCommand
bootstrapPropellorCommand = depsCommand ++ bootstrapPropellorCommand = checkDepsCommand ++
"&& if ! test -x ./propellor; then " "&& if ! test -x ./propellor; then "
++ buildCommand ++ ++ buildCommand ++
"; fi;" ++ checkBinaryCommand "; fi;" ++ checkBinaryCommand
@ -39,6 +39,11 @@ buildCommand = intercalate " && "
, "ln -sf dist/build/propellor-config/propellor-config propellor" , "ln -sf dist/build/propellor-config/propellor-config propellor"
] ]
-- Run cabal configure to check if all dependencies are installed;
-- if not, run the depsCommand.
checkDepsCommand :: ShellCommand
checkDepsCommand = "if ! cabal configure >/dev/null 2>&1; then " ++ depsCommand ++ "; fi"
-- Install build dependencies of propellor. -- Install build dependencies of propellor.
-- --
-- First, try to install ghc, cabal, gnupg, and all haskell libraries that -- First, try to install ghc, cabal, gnupg, and all haskell libraries that