Removes nfpm env workaround (#512)

Signed-off-by: Adrian Cole <adrian@tetrate.io>

Author: codefromthecrypt

Makefile

@@ -116,31 +116,29 @@ dist/func-e_$(VERSION)_%.zip: build/func-e_%/func-e.exe.signed
 	@printf "$(ansi_format_bright)" zip "ok"
 
 # Default to a dummy version, which is always lower than a real release
-nfpm_version=v$(VERSION:dev=0.0.1)
+pkg_version := v$(VERSION:dev=0.0.1)
 
-# It is not precise to put the func-e binary here, but it is easier because the arch pattern matches
-# whereas in RPM it won't.
-# Note: we are only generating this because the file isn't parameterized.
-# See https://github.com/goreleaser/nfpm/issues/362
-build/func-e_linux_%/nfpm.yaml: packaging/nfpm/nfpm.yaml build/func-e_linux_%/func-e
-	@mkdir -p $(@D)
-	@sed -e 's/amd64/$(*)/g' -e 's/v0.0.1/$(nfpm_version)/g' $< > $@
+pkg_config := packaging/nfpm/nfpm.yaml
 
 # We can't use a pattern (%) rule because in RPM amd64 -> x86_64, arm64 -> aarch64
 rpm_x86_64  := dist/func-e_$(VERSION)_linux_x86_64.rpm
 rpm_aarch64 := dist/func-e_$(VERSION)_linux_aarch64.rpm
 rpms        := $(rpm_x86_64) $(rpm_aarch64)
 
 man_page := packaging/nfpm/func-e.8
+pkg_inputs := $(pkg_config) $(man_page)
+
+pkg_binary = build/func-e_linux_$1/func-e
+pkg_arch   = $(patsubst build/func-e_linux_%/func-e,%,$1)
 
-$(rpm_x86_64): build/func-e_linux_amd64/nfpm.yaml $(man_page)
+$(rpm_x86_64): $(call pkg_binary,amd64) $(pkg_inputs)
 	$(call nfpm-pkg,$<,"rpm",$@)
 
-$(rpm_aarch64): build/func-e_linux_arm64/nfpm.yaml $(man_page)
+$(rpm_aarch64): $(call pkg_binary,arm64) $(pkg_inputs)
 	$(call nfpm-pkg,$<,"rpm",$@)
 
 # Debian architectures map goarch for amd64 and arm64
-dist/func-e_$(VERSION)_linux_%.deb: build/func-e_linux_%/nfpm.yaml $(man_page)
+dist/func-e_$(VERSION)_linux_%.deb: $(call pkg_binary,%) $(pkg_inputs)
 	$(call nfpm-pkg,$<,"deb",$@)
 
 # msi-arch is a macro so we can detect it based on the file naming convention
@@ -226,6 +224,6 @@ endef
 define nfpm-pkg
 	@printf "$(ansi_format_dark)" nfpm "packaging $3"
 	@mkdir -p $(dir $3)
-	@$(gotool) nfpm pkg -f $1 --packager $2 --target $3
+	@PKG_ARCH=$(call pkg_arch,$1) PKG_VERSION=$(pkg_version) $(gotool) nfpm pkg -f $(pkg_config) --packager $2 --target $3
 	@printf "$(ansi_format_bright)" nfpm "ok"
 endef

packaging/nfpm/nfpm.yaml

@@ -1,8 +1,8 @@
 # check https://nfpm.goreleaser.com/configuration/ for detailed usage
 name: func-e
-arch: amd64
+arch: ${PKG_ARCH}
 platform: linux
-version: v0.0.1
+version: ${PKG_VERSION}
 section: default
 maintainer: Tetrate Labs <tetratelabs@tetrate.io>
 vendor: Tetrate
@@ -12,7 +12,8 @@ license: Apache-2.0
 provides:
   - func-e
 contents:
-  - src: build/func-e_linux_amd64/func-e
+  - src: build/func-e_linux_${PKG_ARCH}/func-e
     dst: /usr/bin/func-e
+    expand: true
   - src: packaging/nfpm/func-e.8
     dst: /usr/local/share/man/man8/func-e.8

tools/go.mod

@@ -1,6 +1,6 @@
 module github.com/tetratelabs/func-e/tools
 
-go 1.25.6
+go 1.26.2
 
 tool (
 	github.com/B1NARY-GR0UP/nwa
@@ -404,7 +404,7 @@ require (
 	golang.org/x/net v0.53.0 // indirect
 	golang.org/x/oauth2 v0.36.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/sys v0.44.0 // indirect
 	golang.org/x/text v0.36.0 // indirect
 	golang.org/x/time v0.15.0 // indirect
 	golang.org/x/tools v0.44.0 // indirect

tools/go.sum

@@ -1227,8 +1227,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
+golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=