Merge pull request twpayne#612 from twpayne/revert-assets

Revert "Move completions into assets directory"

.github/workflows/main.yml

@@ -50,9 +50,9 @@ jobs:
     - name: Check completions
       if: matrix.os == 'ubuntu-latest'
       run: |
-        go run . completion bash > assets/completions/chezmoi-completion.bash
-        go run . completion fish > assets/completions/chezmoi.fish
-        go run . completion zsh > assets/completions/chezmoi.zsh
+        go run . completion bash > completions/chezmoi-completion.bash
+        go run . completion fish > completions/chezmoi.fish
+        go run . completion zsh > completions/chezmoi.zsh
         git diff --exit-code
     - name: Test release
       if: matrix.os == 'ubuntu-latest'

.goreleaser.yaml

@@ -94,16 +94,16 @@ nfpms:
   - git
   bindir: /usr/bin
   files:
-    "assets/completions/chezmoi-completion.bash": "/usr/share/bash-completion/completions/chezmoi"
-    "assets/completions/chezmoi.fish": "/usr/share/fish/completions/chezmoi.fish"
+    "completions/chezmoi-completion.bash": "/usr/share/bash-completion/completions/chezmoi"
+    "completions/chezmoi.fish": "/usr/share/fish/completions/chezmoi.fish"
   overrides:
     deb:
       file_name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
       replacements:
         386: i386
         arm: armel
       files:
-        "assets/completions/chezmoi.zsh": "/usr/share/zsh/vendor-completions/_chezmoi"
+        "completions/chezmoi.zsh": "/usr/share/zsh/vendor-completions/_chezmoi"
     rpm:
       file_name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Arch }}"
       replacements:
@@ -112,7 +112,7 @@ nfpms:
         arm: armhfp
         arm64: aarch64
       files:
-        "assets/completions/chezmoi.zsh": "/usr/share/zsh/functions/_chezmoi"
+        "completions/chezmoi.zsh": "/usr/share/zsh/functions/_chezmoi"
 
 brews:
 - github:
@@ -125,9 +125,9 @@ brews:
   homepage: "https://chezmoi.io"
   install: |
     bin.install "chezmoi"
-    bash_completion.install "assets/completions/chezmoi-completion.bash"
-    zsh_completion.install "assets/completions/chezmoi.zsh" => "_chezmoi"
-    fish_completion.install "assets/completions/chezmoi.fish"
+    bash_completion.install "completions/chezmoi-completion.bash"
+    zsh_completion.install "completions/chezmoi.zsh" => "_chezmoi"
+    fish_completion.install "completions/chezmoi.fish"
   description: "Manage your dotfiles across multiple machines, securely."
 
 scoop:
@@ -152,4 +152,4 @@ snapcrafts:
   confinement: classic
   apps:
     chezmoi:
-      completer: assets/completions/chezmoi-completion.bash
+      completer: completions/chezmoi-completion.bash

Makefile

@@ -8,20 +8,20 @@ all: completions generate
 
 .PHONY: completions
 completions: \
-	assets/completions/chezmoi-completion.bash \
-	assets/completions/chezmoi.fish \
-	assets/completions/chezmoi.zsh
+	completions/chezmoi-completion.bash \
+	completions/chezmoi.fish \
+	completions/chezmoi.zsh
 
-.PHONY: assets/completions/chezmoi-completion.bash
-assets/completions/chezmoi-completion.bash:
+.PHONY: completions/chezmoi-completion.bash
+completions/chezmoi-completion.bash:
 	mkdir -p $$(dirname $@) && go run . completion bash > $@ || ( rm -f $@ ; false )
 
-.PHONY: assets/completions/chezmoi.fish
-assets/completions/chezmoi.fish:
+.PHONY: completions/chezmoi.fish
+completions/chezmoi.fish:
 	mkdir -p $$(dirname $@) && go run . completion fish > $@ || ( rm -f $@ ; false )
 
-.PHONY: assets/completions/chezmoi.zsh
-assets/completions/chezmoi.zsh:
+.PHONY: completions/chezmoi.zsh
+completions/chezmoi.zsh:
 	mkdir -p $$(dirname $@) && go run . completion zsh > $@ || ( rm -f $@ ; false )
 
 .PHONY: format