try using 'pve-eslint' if it exists

but fallback to 'eslint' otherwise

introduce the defines.mk for this

Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/defines.mk b/defines.mk
new file mode 100644 (file)
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 082d94c330adc32cef94220adaacaa7a61227914..78f2b575cb558160667dcd2b870c642d88025a58 100644 (file)
--- 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 f07dfef6fec0856bf7c032030e5a109d63daaacd..f3856f3160897bdb6ce932f66094f40f2942807b 100644 (file)
--- 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