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 v2 1/1] try using 'pve-eslint' if it exists
Date: Fri, 23 Jun 2023 08:37:42 +0200	[thread overview]
Message-ID: <20230623063742.1130541-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20230623063742.1130541-1-d.csapak@proxmox.com>

but fallback to 'eslint' otherwise

Signed-off-by: Dominik Csapak <d.csapak@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





  parent reply	other threads:[~2023-06-23  6:38 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-23  6:37 [pve-devel] [PATCH eslint/manager/wt/pmg-gui/proxmox-backup v2] change eslint Dominik Csapak
2023-06-23  6:37 ` [pve-devel] [PATCH eslint v2 1/1] change binary name from 'eslint' to 'pve-eslint' Dominik Csapak
2023-06-23  6:37 ` [pve-devel] [PATCH manager v2 1/1] try using 'pve-eslint' if it exists Dominik Csapak
2023-06-23  6:37 ` [pve-devel] [PATCH widget-toolkit " Dominik Csapak
2023-06-23  6:37 ` [pve-devel] [PATCH pmg-gui " Dominik Csapak
2023-06-23  6:37 ` Dominik Csapak [this message]
2023-06-23  6:42 ` [pve-devel] [PATCH eslint/manager/wt/pmg-gui/proxmox-backup v2] change eslint Dominik Csapak

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=20230623063742.1130541-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