From 119cae6d7d18584f2e6d5c5e20f4ba635da3a4f9 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Sat, 22 Jun 2019 14:20:56 +0200
Subject: [PATCH 1/2] Install package binaries in /usr/bin, not /usr/local/bin

---
 .goreleaser.yaml                | 1 +
 goreleaser/goreleaser.yaml.tmpl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index b9560d0137e..f4e64746b9a 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -76,6 +76,7 @@ nfpms:
   - rpm
   dependencies:
   - git
+  bindir: "/usr/bin"
   files:
     "completions/chezmoi-completion.bash": "/usr/share/bash-completion/completions/chezmoi"
     "completions/chezmoi.fish": "/usr/share/fish/completions/chezmoi.fish"
diff --git a/goreleaser/goreleaser.yaml.tmpl b/goreleaser/goreleaser.yaml.tmpl
index 9717ed8eef7..6e199037a44 100644
--- a/goreleaser/goreleaser.yaml.tmpl
+++ b/goreleaser/goreleaser.yaml.tmpl
@@ -76,6 +76,7 @@ nfpms:
   - rpm
   dependencies:
   - git
+  bindir: "/usr/bin"
   files:
     "completions/chezmoi-completion.bash": "/usr/share/bash-completion/completions/chezmoi"
     "completions/chezmoi.fish": "/usr/share/fish/completions/chezmoi.fish"

From 794a1a19ed67b3709e301461106559640fc28587 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Sat, 22 Jun 2019 14:21:04 +0200
Subject: [PATCH 2/2] Install zsh completions

---
 .goreleaser.yaml                | 4 ++++
 goreleaser/goreleaser.yaml.tmpl | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index f4e64746b9a..565f5e5b50b 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -88,11 +88,15 @@ nfpms:
         386: i686
         arm: armhfp
         arm64: aarch64
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/functions/_chezmoi"
     deb:
       name_template: "{{ .ProjectName }}_{{ .Version }}-{{ .Env.TRAVIS_BUILD_NUMBER }}_{{ .Os }}_{{ .Arch }}"
       replacements:
         386: i386
         arm: armel
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/vendor-completions/_chezmoi"
 
 brews:
 - github:
diff --git a/goreleaser/goreleaser.yaml.tmpl b/goreleaser/goreleaser.yaml.tmpl
index 6e199037a44..fa8ba05833d 100644
--- a/goreleaser/goreleaser.yaml.tmpl
+++ b/goreleaser/goreleaser.yaml.tmpl
@@ -88,11 +88,15 @@ nfpms:
         386: i686
         arm: armhfp
         arm64: aarch64
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/functions/_chezmoi"
     deb:
       name_template: "{{ .ProjectName }}_{{ .Version }}-{{ .Env.TRAVIS_BUILD_NUMBER }}_{{ .Os }}_{{ .Arch }}"
       replacements:
         386: i386
         arm: armel
+      files:
+        "completions/chezmoi.zsh": "/usr/share/zsh/vendor-completions/_chezmoi"
 
 brews:
 - github: