From 257cea654cf1fb592fdb5eacc9c1d5a97611a3f1 Mon Sep 17 00:00:00 2001 From: jklippel Date: Mon, 25 Apr 2022 18:41:07 +0200 Subject: [PATCH] add a directory prefix `gitea-src-VERSION` to release-tar-file (#19396) Use a directory prefix instead on creating the tar file. Fixes: #19066 --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5ed50a67382..ab112584c65 100644 --- a/Makefile +++ b/Makefile @@ -646,7 +646,9 @@ release-sources: | $(DIST_DIRS) echo $(VERSION) > $(STORED_VERSION_FILE) # bsdtar needs a ^ to prevent matching subdirectories $(eval EXCL := --exclude=$(shell tar --help | grep -q bsdtar && echo "^")./) - tar $(addprefix $(EXCL),$(TAR_EXCLUDES)) -czf $(DIST)/release/gitea-src-$(VERSION).tar.gz . +# use transform to a add a release-folder prefix; in bsdtar the transform parameter equivalent is -s + $(eval TRANSFORM := $(shell tar --help | grep -q bsdtar && echo "-s '/^./gitea-src-$(VERSION)/'" || echo "--transform 's|^./|gitea-src-$(VERSION)/|'")) + tar $(addprefix $(EXCL),$(TAR_EXCLUDES)) $(TRANSFORM) -czf $(DIST)/release/gitea-src-$(VERSION).tar.gz . rm -f $(STORED_VERSION_FILE) .PHONY: release-docs