From c3209035f15a81ba9bfcf7990eeb12f55c1d787a Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 22 Jun 2023 10:23:05 +0200 Subject: [PATCH] try using 'pve-eslint' if it exists but fallback to 'eslint' otherwise introduce the defines.mk for this Suggested-by: Thomas Lamprecht Signed-off-by: Dominik Csapak --- defines.mk | 1 + js/Makefile | 6 ++++-- js/mobile/Makefile | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 defines.mk diff --git a/defines.mk b/defines.mk new file mode 100644 index 0000000..15d118f --- /dev/null +++ b/defines.mk @@ -0,0 +1 @@ +ESLINT ?= $(if $(shell command -v pve-eslint), pve-eslint, eslint) diff --git a/js/Makefile b/js/Makefile index 082d94c..78f2b57 100644 --- a/js/Makefile +++ b/js/Makefile @@ -1,3 +1,5 @@ +include ../defines.mk + JSSRC= \ Utils.js \ FilterProxy.js \ @@ -106,7 +108,7 @@ OnlineHelpInfo.js: /usr/bin/asciidoc-pmg mv $@.tmp $@ .lint-incremental: $(JSSRC) - eslint $? + $(ESLINT) $? touch "$@" .PHONY: lint @@ -114,7 +116,7 @@ lint: .lint-incremental .PHONY: check check: $(JSSRC) - eslint --strict $(JSSRC) + $(ESLINT) --strict $(JSSRC) touch ".lint-incremental" pmgmanagerlib.js: OnlineHelpInfo.js $(JSSRC) diff --git a/js/mobile/Makefile b/js/mobile/Makefile index f07dfef..f3856f3 100644 --- a/js/mobile/Makefile +++ b/js/mobile/Makefile @@ -1,3 +1,4 @@ +include ../../defines.mk # caution: order is important MOBILESRC= \ @@ -10,7 +11,7 @@ MOBILESRC= \ app.js \ lint: pmgmanagerlib-mobile.js - eslint $^ + $(ESLINT) $^ .PHONY: check check: lint