From bfda263f0cdade20078c1a23511cae430156c828 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 4 Sep 2020 23:48:04 +0200 Subject: [PATCH] Use go install to install tools from go modules (#20926) (cherry picked from commit 65ddc49cd4bcb63bb0252f5d70872137baa51fc7) --- dev-tools/mage/install.go | 4 ++-- libbeat/scripts/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-tools/mage/install.go b/dev-tools/mage/install.go index 5220eb25be3..ec3607f0ec0 100644 --- a/dev-tools/mage/install.go +++ b/dev-tools/mage/install.go @@ -37,7 +37,7 @@ func InstallVendored(importPath string) error { // InstallGoLicenser target installs go-licenser func InstallGoLicenser() error { - return gotool.Get( - gotool.Get.Package(GoLicenserImportPath), + return gotool.Install( + gotool.Install.Package(GoLicenserImportPath), ) } diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile index e17c37bed34..8ffae60348e 100755 --- a/libbeat/scripts/Makefile +++ b/libbeat/scripts/Makefile @@ -25,7 +25,7 @@ ELASTIC_LICENSE_FILE?=../licenses/ELASTIC-LICENSE.txt SECCOMP_BINARY?=${BEAT_NAME} SECCOMP_BLACKLIST?=${ES_BEATS}/libbeat/common/seccomp/seccomp-profiler-blacklist.txt SECCOMP_ALLOWLIST?=${ES_BEATS}/libbeat/common/seccomp/seccomp-profiler-allow.txt -INSTALL_CMD?=get +INSTALL_CMD?=install export INSTALL_FLAG export INSTALL_CMD MAGE_PRESENT := $(shell command -v mage 2> /dev/null)