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. --- Makefile | 2 +- src/Propellor/Bootstrap.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8f0414fe..fffecb1e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DATE := $(shell dpkg-parsechangelog 2>/dev/null | grep Date | cut -d " " -f2-) build: tags propellor.1 configured $(CABAL) build @if [ -d dist-newstyle ]; then \ - ln -sf $$(find dist-newstyle/ -executable -type f | grep 'build/propellor-config/propellor-config$$' | tail -n1) propellor; \ + ln -sf $$(cabal exec -- sh -c 'command -v propellor-config') propellor; \ else \ ln -sf dist/build/propellor-config/propellor-config propellor; \ fi 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