olemd/favoritter
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: use envsubst for nfpm variable expansion in Makefile

Browse source 
nfpm v2 does not expand ${VAR} in contents.src fields. The deb/rpm
targets now pipe nfpm.yaml through envsubst to resolve ARCH and
VERSION before passing the config to nfpm.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ole-Morten Duesund 2026-03-29 19:18:14 +02:00
commit ab07a7f93f
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -29,24 +29,30 @@ build-all: $(DIST)
./cmd/favoritter; \ ./cmd/favoritter; \
done done
## Build .deb packages (requires nfpm) ## Build .deb packages (requires nfpm and envsubst)
deb: build-all deb: build-all
@for platform in $(PLATFORMS); do \ @for platform in $(PLATFORMS); do \
arch=$${platform##*/}; \ arch=$${platform##*/}; \
echo "Packaging deb for $$arch..."; \ echo "Packaging deb for $$arch..."; \
ARCH=$$arch VERSION=$(VERSION) nfpm package \ ARCH=$$arch VERSION=$(VERSION) envsubst < nfpm.yaml > $(DIST)/nfpm-$$arch.yaml; \
nfpm package \
--config $(DIST)/nfpm-$$arch.yaml \
--packager deb \ --packager deb \
--target $(DIST)/favoritter_$(VERSION)_$${arch}.deb; \ --target $(DIST)/favoritter_$(VERSION)_$${arch}.deb; \
rm -f $(DIST)/nfpm-$$arch.yaml; \
done done
## Build .rpm packages (requires nfpm) ## Build .rpm packages (requires nfpm and envsubst)
rpm: build-all rpm: build-all
@for platform in $(PLATFORMS); do \ @for platform in $(PLATFORMS); do \
arch=$${platform##*/}; \ arch=$${platform##*/}; \
echo "Packaging rpm for $$arch..."; \ echo "Packaging rpm for $$arch..."; \
ARCH=$$arch VERSION=$(VERSION) nfpm package \ ARCH=$$arch VERSION=$(VERSION) envsubst < nfpm.yaml > $(DIST)/nfpm-$$arch.yaml; \
nfpm package \
--config $(DIST)/nfpm-$$arch.yaml \
--packager rpm \ --packager rpm \
--target $(DIST)/favoritter_$(VERSION)_$${arch}.rpm; \ --target $(DIST)/favoritter_$(VERSION)_$${arch}.rpm; \
rm -f $(DIST)/nfpm-$$arch.yaml; \
done done
## Build container image ## Build container image