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 284178DC0 for ; Fri, 23 Jun 2023 08:38:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F312D2EED9 for ; Fri, 23 Jun 2023 08:37:44 +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 08:37:44 +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 AF53942D85 for ; Fri, 23 Jun 2023 08:37:43 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 23 Jun 2023 08:37:41 +0200 Message-Id: <20230623063742.1130541-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230623063742.1130541-1-d.csapak@proxmox.com> References: <20230623063742.1130541-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 pmg-gui v2 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 06:38:15 -0000 but fallback to 'eslint' otherwise introduce the defines.mk for this Signed-off-by: Dominik Csapak --- defines.mk | 5 +++++ js/Makefile | 6 ++++-- js/mobile/Makefile | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 defines.mk diff --git a/defines.mk b/defines.mk new file mode 100644 index 0000000..b88eef1 --- /dev/null +++ b/defines.mk @@ -0,0 +1,5 @@ +ifneq ("$(wildcard /usr/bin/pve-eslint)", "") + ESLINT ?= /usr/bin/pve-eslint +else + ESLINT ?= /usr/bin/eslint +endif 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