npm bin removed since npm 9.0.0

https://github.com/npm/cli/blob/latest/CHANGELOG.md I LOVE NEEDLESS SOFTWARE CHURN
galaxyproject · Nov 20, 2023 · 4b2519c · 4b2519c
1 parent 51d82a6
commit 4b2519c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"