but fallback to 'eslint' otherwise
Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
defines.mk | 6 ++++++
www/Makefile | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/defines.mk b/defines.mk
index cd5b52a2..68e7741c 100644
--- a/defines.mk
+++ b/defines.mk
@@ -11,5 +11,11 @@ JSDIR = $(DATAROOTDIR)/javascript/proxmox-backup
SYSCONFDIR = /etc
ZSH_COMPL_DEST = $(PREFIX)/share/zsh/vendor-completions
+ifneq ("$(wildcard /usr/bin/pve-eslint)", "")
+ ESLINT ?= /usr/bin/pve-eslint
+else
+ ESLINT ?= /usr/bin/eslint
+endif
+
# For local overrides
-include local.mak
diff --git a/www/Makefile b/www/Makefile
index 476c80b6..2f1df442 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -133,11 +133,11 @@ js/proxmox-backup-gui.js: .lint-incremental js
OnlineHelpInfo.js ${JSSRC}
.PHONY: check
check:
- eslint --strict ${JSSRC}
+ $(ESLINT) --strict ${JSSRC}
touch ".lint-incremental"
.lint-incremental: ${JSSRC}
- eslint $?
+ $(ESLINT) $?
touch "$@"
.PHONY: clean
--
2.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
