all lists on 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 proxmox-backup v3 1/1] try using 'pve-eslint' if it exists
Date: Fri, 23 Jun 2023 09:08:47 +0200	[thread overview]
Message-ID: <20230623070847.1672322-6-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>
---
 defines.mk   | 1 +
 www/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/defines.mk b/defines.mk
index cd5b52a2..c113d4e1 100644
--- a/defines.mk
+++ b/defines.mk
@@ -10,6 +10,7 @@ DOCDIR = $(PREFIX)/share/doc/proxmox-backup
 JSDIR = $(DATAROOTDIR)/javascript/proxmox-backup
 SYSCONFDIR = /etc
 ZSH_COMPL_DEST = $(PREFIX)/share/zsh/vendor-completions
+ESLINT ?= $(if $(shell command -v pve-eslint), pve-eslint, eslint)
 
 # 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





  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 ` [pve-devel] [PATCH pmg-gui " Dominik Csapak
2023-08-30  9:42   ` [pve-devel] applied: " Thomas Lamprecht
2023-06-23  7:08 ` Dominik Csapak [this message]
2023-06-24 15:51   ` [pve-devel] applied: [PATCH proxmox-backup " 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-6-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