From 0d03855787d526e51980e5935d9a59c83f92f143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Edstr=C3=B6m?=
 <108799+Legogris@users.noreply.github.com>
Date: Thu, 14 Jan 2021 00:31:08 +0900
Subject: [PATCH] Arch consistent filenames (#1015)

* Include individual binary checksums for vmutils

* Consistent archive/binary artefacts between arm64/amd64 for vmutils

* architecture in arhcive, checksums
* not in binaries
---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index cd02309f8..cb26656a3 100644
--- a/Makefile
+++ b/Makefile
@@ -74,8 +74,9 @@ release-vmutils: \
 	vmauth-prod \
 	vmbackup-prod \
 	vmrestore-prod
-	cd bin && tar czf vmutils-$(PKG_TAG).tar.gz vmagent-prod vmalert-prod vmauth-prod vmbackup-prod vmrestore-prod && \
-		sha256sum vmutils-$(PKG_TAG).tar.gz > vmutils-$(PKG_TAG)_checksums.txt
+	cd bin && \
+		tar -czf vmutils-amd64-$(PKG_TAG).tar.gz vm{agent,alert,auth,backup,restore}-prod && \
+		sha256sum vmutils-amd64-$(PKG_TAG).tar.gz vm{agent,alert,auth,backup,restore}-prod > vmutils-$(PKG_TAG)_checksums.txt
 
 release-vmutils-arm64: \
 	vmagent-arm64-prod \
@@ -83,9 +84,9 @@ release-vmutils-arm64: \
 	vmauth-arm64-prod \
 	vmbackup-arm64-prod \
 	vmrestore-arm64-prod
-	cd bin && tar czf vmutils-arm64-$(PKG_TAG).tar.gz vmagent-arm64-prod vmalert-arm64-prod vmauth-arm64-prod vmbackup-arm64-prod vmrestore-arm64-prod && \
-		sha256sum vmutils-arm64-$(PKG_TAG).tar.gz > vmutils-arm64-$(PKG_TAG)_checksums.txt
-
+	cd bin && \
+		tar --transform="flags=r;s|-arm64||" -czf vmutils-arm64-$(PKG_TAG).tar.gz vm{agent,alert,auth,backup,restore}-arm64-prod && \
+		sha256sum vmutils-arm64-$(PKG_TAG).tar.gz  vm{agent,alert,auth,backup,restore}-arm64-prod | sed s/arm64-prod/prod/ > vmutils-arm64-$(PKG_TAG)_checksums.txt
 
 pprof-cpu:
 	go tool pprof -trim_path=github.com/VictoriaMetrics/VictoriaMetrics@ $(PPROF_FILE)