Skip to content

Commit 90c6e52

Browse files
Copilotmapitman
andcommitted
Fix tar command to handle VERSION with forward slashes
Co-authored-by: mapitman <4205286+mapitman@users.noreply.github.com>
1 parent b04a4c1 commit 90c6e52

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
MANSECTION ?= 1
22
SHELL=/bin/bash
3+
# Sanitize VERSION for use in filenames and tar transform expressions
4+
# Replace forward slashes with dashes to avoid issues with tar --transform
5+
VERSION_SAFE = $(subst /,-,$(VERSION))
36
.PHONY: clean snap rpm rpm-setup rpm-local rpm-clean ci-sim-ubuntu ci-sim-fedora ci-sim
47
default: linux
58
all: linux windows darwin freebsd
@@ -20,7 +23,7 @@ deb/linux-amd64: bin/linux-amd64/mdview
2023
cp -r bin/linux-amd64/mdview package/usr/bin/mdview
2124
cp mdview.1 package/usr/share/man/man1/
2225
dpkg-deb --build package
23-
mv package.deb mdview_$(VERSION)_amd64.deb
26+
mv package.deb mdview_$(VERSION_SAFE)_amd64.deb
2427

2528
deb/linux-arm64: bin/linux-arm64/mdview
2629
mkdir -p package/DEBIAN
@@ -31,44 +34,44 @@ deb/linux-arm64: bin/linux-arm64/mdview
3134
cp -r bin/linux-arm64/mdview package/usr/bin/mdview
3235
cp mdview.1 package/usr/share/man/man1/
3336
dpkg-deb --build package
34-
mv package.deb mdview_$(VERSION)_arm64.deb
37+
mv package.deb mdview_$(VERSION_SAFE)_arm64.deb
3538

3639
snap:
3740
snapcraft pack
3841

3942
bin/linux-amd64/mdview: manpage
4043
env GOOS=linux GOARCH=amd64 go build -buildvcs=false -ldflags "-X main.appVersion=$(VERSION)" -o ./bin/linux-amd64/mdview
4144
cp mdview.1 bin/linux-amd64/
42-
tar czvf mdview-$(VERSION)-linux-amd64.tar.gz --transform s/linux-amd64/mdview-$(VERSION)/ -C bin linux-amd64
45+
tar czvf mdview-$(VERSION_SAFE)-linux-amd64.tar.gz --transform s/linux-amd64/mdview-$(VERSION_SAFE)/ -C bin linux-amd64
4346

4447
bin/linux-i386/mdview:
4548
env GOOS=linux GOARCH=386 go build -buildvcs=false -ldflags "-X main.appVersion=$(VERSION)" -o ./bin/linux-i386/mdview
4649
cp mdview.1 bin/linux-i386/
47-
tar czvf mdview-$(VERSION)-linux-i386.tar.gz --transform s/linux-i386/mdview-$(VERSION)/ -C bin linux-i386
50+
tar czvf mdview-$(VERSION_SAFE)-linux-i386.tar.gz --transform s/linux-i386/mdview-$(VERSION_SAFE)/ -C bin linux-i386
4851

4952
bin/linux-arm64/mdview:
5053
env GOOS=linux GOARCH=arm64 go build -buildvcs=false -ldflags "-X main.appVersion=$(VERSION)" -o ./bin/linux-arm64/mdview
5154
cp mdview.1 bin/linux-arm64/
52-
tar czvf mdview-$(VERSION)-linux-arm64.tar.gz --transform s/linux-arm64/mdview-$(VERSION)/ -C bin linux-arm64
55+
tar czvf mdview-$(VERSION_SAFE)-linux-arm64.tar.gz --transform s/linux-arm64/mdview-$(VERSION_SAFE)/ -C bin linux-arm64
5356

5457
bin/windows-amd64/mdview.exe:
5558
env GOOS=windows GOARCH=amd64 go build -buildvcs=false -ldflags "-X main.appVersion=$(VERSION)" -o ./bin/windows-amd64/mdview.exe
56-
zip -j mdview-$(VERSION)-windows-amd64.zip bin/windows-amd64/mdview.exe
59+
zip -j mdview-$(VERSION_SAFE)-windows-amd64.zip bin/windows-amd64/mdview.exe
5760

5861
bin/darwin-amd64/mdview:
5962
env GOOS=darwin GOARCH=amd64 go build -buildvcs=false -ldflags "-X main.appVersion=$(VERSION)" -o ./bin/darwin-amd64/mdview
6063
cp mdview.1 bin/darwin-amd64/
61-
tar czvf mdview-$(VERSION)-darwin-amd64.tar.gz --transform s/darwin-amd64/mdview-$(VERSION)/ -C bin darwin-amd64
64+
tar czvf mdview-$(VERSION_SAFE)-darwin-amd64.tar.gz --transform s/darwin-amd64/mdview-$(VERSION_SAFE)/ -C bin darwin-amd64
6265

6366
bin/darwin-arm64/mdview:
6467
env GOOS=darwin GOARCH=arm64 go build -buildvcs=false -ldflags "-X main.appVersion=$(VERSION)" -o ./bin/darwin-arm64/mdview
6568
cp mdview.1 bin/darwin-arm64/
66-
tar czvf mdview-$(VERSION)-darwin-arm64.tar.gz --transform s/darwin-arm64/mdview-$(VERSION)/ -C bin darwin-arm64
69+
tar czvf mdview-$(VERSION_SAFE)-darwin-arm64.tar.gz --transform s/darwin-arm64/mdview-$(VERSION_SAFE)/ -C bin darwin-arm64
6770

6871
bin/freebsd-amd64/mdview:
6972
env GOOS=freebsd GOARCH=amd64 go build -buildvcs=false -ldflags "-X main.appVersion=$(VERSION)" -o ./bin/freebsd-amd64/mdview
7073
cp mdview.1 bin/freebsd-amd64/mdview
71-
tar czvf mdview-$(VERSION)-freebsd-amd64.tar.gz --transform s/freebsd-amd64/mdview-$(VERSION)/ -C bin freebsd-amd64
74+
tar czvf mdview-$(VERSION_SAFE)-freebsd-amd64.tar.gz --transform s/freebsd-amd64/mdview-$(VERSION_SAFE)/ -C bin freebsd-amd64
7275

7376
clean:
7477
rm -rf bin

0 commit comments

Comments
 (0)