chezmoi2: Rename binary to chezmoi2

infogrind · Jan 25, 2021 · dad2040 · dad2040
1 parent cd0db23
commit dad2040
Show file tree

Hide file tree

Showing 11 changed files with 269 additions and 266 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -86,7 +86,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: chezmoi2-linux-amd64
-        path: dist/chezmoi2-cgo-glibc_linux_amd64/chezmoi
+        path: dist/chezmoi2-cgo-glibc_linux_amd64/chezmoi2
     - name: Artifact chezmoi-linux-musl-amd64
       uses: actions/upload-artifact@v2
       with:
@@ -96,7 +96,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: chezmoi2-linux-musl-amd64
-        path: dist/chezmoi2-cgo-musl_linux_amd64/chezmoi
+        path: dist/chezmoi2-cgo-musl_linux_amd64/chezmoi2
     - name: Artifact chezmoi-macos-amd64
       uses: actions/upload-artifact@v2
       with:
@@ -106,7 +106,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: chezmoi2-macos-amd64
-        path: dist/chezmoi2-nocgo_darwin_amd64/chezmoi
+        path: dist/chezmoi2-nocgo_darwin_amd64/chezmoi2
     - name: Artifact chezmoi-windows-amd64
       uses: actions/upload-artifact@v2
       with:
@@ -116,7 +116,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: chezmoi2-windows-amd64
-        path: dist/chezmoi2-nocgo_windows_amd64/chezmoi.exe
+        path: dist/chezmoi2-nocgo_windows_amd64/chezmoi2.exe
   generate:
     runs-on: ubuntu-18.04
     steps:

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -53,6 +53,7 @@ builds:
   - goos: linux
     goarch: amd64
 - id: chezmoi2-cgo-glibc
+  binary: chezmoi2
   main: ./chezmoi2/main.go
   env:
   - CGO_ENABLED=1
@@ -61,6 +62,7 @@ builds:
   goarch:
   - amd64
 - id: chezmoi2-cgo-musl
+  binary: chezmoi2
   main: ./chezmoi2/main.go
   env:
   - CC=/usr/bin/musl-gcc
@@ -79,6 +81,7 @@ builds:
   - '-linkmode external'
   - '--extldflags "-static"'
 - id: chezmoi2-nocgo
+  binary: chezmoi2
   main: ./chezmoi2/main.go
   env:
   - CGO_ENABLED=0

diff --git a/chezmoi2/cmd/config.go b/chezmoi2/cmd/config.go
@@ -723,7 +723,7 @@ func (c *Config) marshal(formatStr string, data interface{}) error {
 
 func (c *Config) newRootCmd() (*cobra.Command, error) {
 	rootCmd := &cobra.Command{
-		Use:                "chezmoi",
+		Use:                "chezmoi2",
 		Short:              "Manage your dotfiles across multiple diverse machines, securely",
 		Version:            c.versionStr,
 		PersistentPreRunE:  c.persistentPreRunRootE,