From ca653bf689e416089a225e85b473d23c8741d886 Mon Sep 17 00:00:00 2001
From: Tom Ellis <tom-git@jaguarpaw.co.uk>
Date: Mon, 3 Jan 2022 16:25:35 +0000
Subject: [PATCH] More robust command to find haskell-org-site executable path

---
 README.md     | 2 +-
 buildAndWatch | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1b2a67a..3e88cf4 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ name of the executable. From the builder directory, you can find the executable
 path by running:
 
 ```
-find dist-newstyle -name 'haskell-org-site' -type f
+cabal v2-exec -- which haskell-org-site
 ```
 
 Using that path, you can run the builder from the project root directory.
diff --git a/buildAndWatch b/buildAndWatch
index f3569f6..6372065 100755
--- a/buildAndWatch
+++ b/buildAndWatch
@@ -27,9 +27,8 @@ function buildAndWatchWithoutNix() {
 
     pushd builder
     cabal v2-build
-    builderPath=$(find dist-newstyle -name 'haskell-org-site' -type f)
+    builder=$(cabal v2-exec -- which haskell-org-site)
     popd
-    builder="./builder/${builderPath}"
 
     if [[ ! -x "${builder}" ]]; then
         cat <<EOF