From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pmg-gui v3 1/1] try using 'pve-eslint' if it exists
Date: Fri, 23 Jun 2023 09:08:46 +0200 [thread overview]
Message-ID: <20230623070847.1672322-5-d.csapak@proxmox.com> (raw)
In-Reply-To: <20230623070847.1672322-1-d.csapak@proxmox.com>
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>
---
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
next prev parent reply other threads:[~2023-06-23 7:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 7:08 [pve-devel] [PATCH eslint/manager/wt/pmg-gui/proxmox-backup v3] change eslint Dominik Csapak
2023-06-23 7:08 ` [pve-devel] [PATCH eslint v3 1/1] change binary name from 'eslint' to 'pve-eslint' Dominik Csapak
2023-08-30 9:42 ` [pve-devel] applied: " Thomas Lamprecht
2023-06-23 7:08 ` [pve-devel] [PATCH manager v3 1/1] try using 'pve-eslint' if it exists Dominik Csapak
2023-06-24 15:45 ` [pve-devel] applied: " Thomas Lamprecht
2023-06-23 7:08 ` [pve-devel] [PATCH widget-toolkit " Dominik Csapak
2023-06-24 15:51 ` [pve-devel] applied: " Thomas Lamprecht
2023-06-23 7:08 ` Dominik Csapak [this message]
2023-08-30 9:42 ` [pve-devel] applied: [PATCH pmg-gui " Thomas Lamprecht
2023-06-23 7:08 ` [pve-devel] [PATCH proxmox-backup " Dominik Csapak
2023-06-24 15:51 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230623070847.1672322-5-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal