Merge branch 'main' into dedupliate-binary-artifacts

goreleaser · Feb 15, 2022 · dd2ede7 · dd2ede7
2 parents 9395e02 + d07a5a8
commit dd2ede7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/internal/pipe/nfpm/nfpm.go b/internal/pipe/nfpm/nfpm.go
@@ -46,7 +46,7 @@ func (Pipe) Default(ctx *context.Context) error {
 			fpm.ID = "default"
 		}
 		if fpm.Bindir == "" {
-			fpm.Bindir = "/usr/local/bin"
+			fpm.Bindir = "/usr/bin"
 		}
 		if fpm.PackageName == "" {
 			fpm.PackageName = ctx.Config.ProjectName

diff --git a/internal/pipe/nfpm/nfpm_test.go b/internal/pipe/nfpm/nfpm_test.go
@@ -363,8 +363,8 @@ func TestInvalidTemplate(t *testing.T) {
 
 	t.Run("bindir", func(t *testing.T) {
 		ctx := makeCtx()
-		ctx.Config.NFPMs[0].Bindir = "/usr/local/{{ .NOPE }}"
-		require.Contains(t, Pipe{}.Run(ctx).Error(), `template: tmpl:1:14: executing "tmpl" at <.NOPE>: map has no entry for key "NOPE"`)
+		ctx.Config.NFPMs[0].Bindir = "/usr/{{ .NOPE }}"
+		require.Contains(t, Pipe{}.Run(ctx).Error(), `template: tmpl:1:8: executing "tmpl" at <.NOPE>: map has no entry for key "NOPE"`)
 	})
 }
 
@@ -511,7 +511,7 @@ func TestDefault(t *testing.T) {
 		},
 	}
 	require.NoError(t, Pipe{}.Default(ctx))
-	require.Equal(t, "/usr/local/bin", ctx.Config.NFPMs[0].Bindir)
+	require.Equal(t, "/usr/bin", ctx.Config.NFPMs[0].Bindir)
 	require.Equal(t, []string{"foo", "bar"}, ctx.Config.NFPMs[0].Builds)
 	require.Equal(t, defaultNameTemplate, ctx.Config.NFPMs[0].FileNameTemplate)
 	require.Equal(t, ctx.Config.ProjectName, ctx.Config.NFPMs[0].PackageName)

diff --git a/www/docs/customization/nfpm.md b/www/docs/customization/nfpm.md
@@ -92,7 +92,7 @@ nfpms:
       - fish
 
     # Template to the path that the binaries should be installed.
-    # Defaults to `/usr/local/bin`.
+    # Defaults to `/usr/bin`.
     bindir: /usr/bin
 
     # Version Epoch.