From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A5A738EE1 for ; Fri, 23 Jun 2023 09:09:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 86F032F5C4 for ; Fri, 23 Jun 2023 09:08:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 23 Jun 2023 09:08:48 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A2F5442D94 for ; Fri, 23 Jun 2023 09:08:48 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 23 Jun 2023 09:08:45 +0200 Message-Id: <20230623070847.1672322-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230623070847.1672322-1-d.csapak@proxmox.com> References: <20230623070847.1672322-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [defines.mk] Subject: [pve-devel] [PATCH widget-toolkit v3 1/1] try using 'pve-eslint' if it exists X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jun 2023 07:09:19 -0000 but fallback to 'eslint' otherwise Suggested-by: Thomas Lamprecht Signed-off-by: Dominik Csapak --- 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