From 06aa1967c931cbe3e00848af59a76ceb7e07b0a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Jun 2020 13:58:19 -0400 Subject: use cabal exec to find path of propellor binary This turns out to be much faster than cabal install, which does unnecessary rebuilds and other work (https://github.com/haskell/cabal/issues/6919) This commit was sponsored by Jack Hill on Patreon. --- src/Propellor/Bootstrap.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 84a26ee3..d929c2cd 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -83,7 +83,7 @@ buildCommand bs = intercalate " && " (go (getBuilder bs)) , "cabal build -j1 propellor-config" , intercalate "; " [ "if [ -d dist-newstyle ]" - , "then ln -sf $(find dist-newstyle/ -executable -type f | grep 'build/propellor-config/propellor-config$' | tail -n1) propellor" + , "then ln -sf $(cabal exec -- sh -c 'command -v propellor-config') propellor" , "else ln -sf dist/build/propellor-config/propellor-config propellor" , "fi" ] -- cgit v1.2.3