[pve-devel] [PATCH pmg-gui v3 1/1] try using 'pve-eslint' if it exists

Dominik Csapak d.csapak at proxmox.com
Fri Jun 23 09:08:46 CEST 2023


but fallback to 'eslint' otherwise

introduce the defines.mk for this

Suggested-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 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 fad2bd6..612a185 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 3e379d2..31afab8 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
-- 
2.30.2






More information about the pve-devel mailing list