[pve-devel] [PATCH widget-toolkit v2 1/1] try using 'pve-eslint' if it exists

[Dominik Csapak]

but fallback to 'eslint' otherwise

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 src/Makefile   | 6 +++---
 src/defines.mk | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 7cff5dd..2fca191 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -110,14 +110,14 @@ all: $(SUBDIRS)
 	set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
 
 .lint-incremental: $(JSSRC)
-	eslint $?
+	$(ESLINT) $?
 	touch "$@"
 
 .PHONY: lint
 check: lint
-	eslint --strict api-viewer/APIViewer.js
+	$(ESLINT) --strict api-viewer/APIViewer.js
 lint: $(JSSRC)
-	eslint --strict $(JSSRC)
+	$(ESLINT) --strict $(JSSRC)
 	touch ".lint-incremental"
 
 BUILD_TIME=$(or $(SOURCE_DATE_EPOCH),$(shell date '+%s.%N'))
diff --git a/src/defines.mk b/src/defines.mk
index 36d5353..545560c 100644
--- a/src/defines.mk
+++ b/src/defines.mk
@@ -6,3 +6,9 @@ WWWBASEDIR=$(DESTDIR)/usr/share/javascript/$(PACKAGE)
 WWWCSSDIR=$(WWWBASEDIR)/css
 WWWIMAGESDIR=$(WWWBASEDIR)/images
 WWWTHEMEDIR=$(WWWBASEDIR)/themes
+
+ifneq ("$(wildcard /usr/bin/pve-eslint)", "")
+    ESLINT ?= /usr/bin/pve-eslint
+else
+    ESLINT ?= /usr/bin/eslint
+endif
-- 
2.30.2