but fallback to 'eslint' otherwise
Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
defines.mk | 7 +++++++
www/manager6/Makefile | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/defines.mk b/defines.mk
index 3a5792ad..b75671f4 100644
--- a/defines.mk
+++ b/defines.mk
@@ -19,3 +19,10 @@ WWWTOUCHDIR=${WWWBASEDIR}/touch
WWWCSSDIR=${WWWBASEDIR}/css
WWWFONTSDIR=${WWWBASEDIR}/css/fonts
WWWJSDIR=${WWWBASEDIR}/js
+
+ifneq ("$(wildcard /usr/bin/pve-eslint)", "")
+ ESLINT ?= /usr/bin/pve-eslint
+else
+ ESLINT ?= /usr/bin/eslint
+endif
+
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 2d884f4a..ff113aa2 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -314,13 +314,13 @@
WIDGETKIT=/usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
all:
.lint-incremental: $(JSSRC)
- eslint $?
+ $(ESLINT) $?
touch "$@"
.PHONY: lint
check: lint
lint: $(JSSRC)
- eslint --strict $(JSSRC)
+ $(ESLINT) --strict $(JSSRC)
touch ".lint-incremental"
pvemanagerlib.js: .lint-incremental OnlineHelpInfo.js $(JSSRC)
--
2.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
