From 4b2519cc4a0c8988dfb0b10df517cb01aaab5d33 Mon Sep 17 00:00:00 2001
From: Helena Rasche <hexylena@galaxians.org>
Date: Mon, 20 Nov 2023 12:11:38 +0100
Subject: [PATCH] npm bin removed since npm 9.0.0

https://github.com/npm/cli/blob/latest/CHANGELOG.md I LOVE NEEDLESS SOFTWARE CHURN
---
 .github/workflows/video-dry.yml | 2 +-
 Makefile                        | 6 +++---
 bin/ari-make.sh                 | 2 +-
 bin/ari.sh                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/video-dry.yml b/.github/workflows/video-dry.yml
index 43ae802d384213..1926078310d336 100644
--- a/.github/workflows/video-dry.yml
+++ b/.github/workflows/video-dry.yml
@@ -67,4 +67,4 @@ jobs:
 
           echo "Software Versions"
           $FFMPEG_PATH/ffmpeg -version
-          $(npm bin)/editly --version
+          ./node_modules/.bin/editly --version
diff --git a/Makefile b/Makefile
index 102d7e493608e9..7c256a576aee72 100644
--- a/Makefile
+++ b/Makefile
@@ -217,17 +217,17 @@ _site/%/tutorial.pdf: _site/%/tutorial.html
 
 _site/%/slides.pdf: _site/%/slides.html
 	$(ACTIVATE_ENV) && \
-	$(shell npm bin)/http-server _site -p 9876 & \
+	./node_modules/.bin/http-server _site -p 9876 & \
 	docker run --rm --network host -v $(shell pwd):/slides astefanutti/decktape  automatic -s 1920x1080 http://127.0.0.1:9876/$(<:_site/%=%) /slides/$@
 
 _site/%/slides_ES.pdf: _site/%/slides_ES.html
 	$(ACTIVATE_ENV) && \
-	$(shell npm bin)/http-server _site -p 9876 & \
+	./node_modules/.bin/http-server _site -p 9876 & \
 	docker run --rm --network host -v $(shell pwd):/slides astefanutti/decktape  automatic -s 1920x1080 http://127.0.0.1:9876/$(<:_site/%=%) /slides/$@
 
 _site/%/slides_CAT_ES.pdf: _site/%/slides_CAT_ES.html
 	$(ACTIVATE_ENV) && \
-	$(shell npm bin)/http-server _site -p 9876 & \
+	./node_modules/.bin/http-server _site -p 9876 & \
 	docker run --rm --network host -v $(shell pwd):/slides astefanutti/decktape  automatic -s 1920x1080 http://127.0.0.1:9876/$(<:_site/%=%) /slides/$@
 
 video: ## Build all videos
diff --git a/bin/ari-make.sh b/bin/ari-make.sh
index c09752a8442ed0..4cb3cf14e79631 100755
--- a/bin/ari-make.sh
+++ b/bin/ari-make.sh
@@ -15,7 +15,7 @@ else
 	changed_slides="$(echo "$videos" | xargs ./bin/filter-resource-metadata video)"
 fi
 
-$(npm bin)/http-server -p 9876 _site &
+./node_modules/.bin/http-server -p 9876 _site &
 
 for slides in $changed_slides; do
 	echo "====== $slides ======"
diff --git a/bin/ari.sh b/bin/ari.sh
index 043e8fe0d5ff78..78645666ca9ed4 100755
--- a/bin/ari.sh
+++ b/bin/ari.sh
@@ -82,9 +82,9 @@ ruby bin/ari-prep-script.rb "${build_dir}" "${engine}"
 echo "  Extracting slides"
 convert "${slides}" -resize 1920x1080 "${build_dir}/slides.%03d.png"
 
-echo "  Building Video | $(npm bin)/editly --json ${build_dir}/editly.json5"
+echo "  Building Video | ./node_modules/.bin/editly --json ${build_dir}/editly.json5"
 $FFMPEG_PATH/ffmpeg -version
-$(npm bin)/editly --json "${build_dir}/editly.json5"
+./node_modules/.bin/editly --json "${build_dir}/editly.json5"
 
 # Mux it together
 echo "  Muxing"