public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH widget-toolkit v3 1/1] try using 'pve-eslint' if it exists
Date: Fri, 23 Jun 2023 09:08:45 +0200	[thread overview]
Message-ID: <20230623070847.1672322-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20230623070847.1672322-1-d.csapak@proxmox.com>

but fallback to 'eslint' otherwise

Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/Makefile   | 6 +++---
 src/defines.mk | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 7cff5dd..2fca191 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -110,14 +110,14 @@ all: $(SUBDIRS)
 	set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
 
 .lint-incremental: $(JSSRC)
-	eslint $?
+	$(ESLINT) $?
 	touch "$@"
 
 .PHONY: lint
 check: lint
-	eslint --strict api-viewer/APIViewer.js
+	$(ESLINT) --strict api-viewer/APIViewer.js
 lint: $(JSSRC)
-	eslint --strict $(JSSRC)
+	$(ESLINT) --strict $(JSSRC)
 	touch ".lint-incremental"
 
 BUILD_TIME=$(or $(SOURCE_DATE_EPOCH),$(shell date '+%s.%N'))
diff --git a/src/defines.mk b/src/defines.mk
index 36d5353..936b51e 100644
--- a/src/defines.mk
+++ b/src/defines.mk
@@ -6,3 +6,4 @@ WWWBASEDIR=$(DESTDIR)/usr/share/javascript/$(PACKAGE)
 WWWCSSDIR=$(WWWBASEDIR)/css
 WWWIMAGESDIR=$(WWWBASEDIR)/images
 WWWTHEMEDIR=$(WWWBASEDIR)/themes
+ESLINT ?= $(if $(shell command -v pve-eslint), pve-eslint, eslint)
-- 
2.30.2





  parent reply	other threads:[~2023-06-23  7:09 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 ` Dominik Csapak [this message]
2023-06-24 15:51   ` [pve-devel] applied: [PATCH widget-toolkit " Thomas Lamprecht
2023-06-23  7:08 ` [pve-devel] [PATCH pmg-gui " Dominik Csapak
2023-08-30  9:42   ` [pve-devel] applied: " 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-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal