Merge pull request twpayne#1232 from twpayne/refactor-dir-structure

Tidy up tests and refactor directory structure
ryanwwest · May 25, 2021 · 4191e4b · 4191e4b
2 parents 5258802 + 5eb6def
commit 4191e4b
Show file tree

Hide file tree

Showing 170 changed files with 50 additions and 54 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -167,7 +167,7 @@ jobs:
       with:
         scandir: ./assets/scripts
     - name: Whitespace
-      run: go run ./internal/cmd/lint-whitespace
+      run: go run ./internal/cmds/lint-whitespace
     - name: Typos
       run: |
         go install github.com/twpayne/findtypos@latest

diff --git a/.golangci.yml b/.golangci.yml
@@ -96,7 +96,7 @@ issues:
   - linters:
     - forbidigo
     - gosec
-    path: ^internal/cmd/
+    path: ^internal/cmds/
   - linters:
     - gosec
     path: "_test\\.go$"
diff --git a/Makefile b/Makefile
@@ -48,13 +48,13 @@ completions:
 	$(GO) run . completion powershell -o completions/chezmoi.ps1
 	$(GO) run . completion zsh -o completions/chezmoi.zsh
 
-assets/scripts/install.sh: internal/cmd/generate-install.sh/install.sh.tmpl internal/cmd/generate-install.sh/main.go
-	$(GO) run ./internal/cmd/generate-install.sh > $@
+assets/scripts/install.sh: internal/cmds/generate-install.sh/install.sh.tmpl internal/cmds/generate-install.sh/main.go
+	$(GO) run ./internal/cmds/generate-install.sh > $@
 
 .PHONY: lint
 lint: ensure-golangci-lint
 	./bin/golangci-lint run
-	$(GO) run ./internal/cmd/lint-whitespace
+	$(GO) run ./internal/cmds/lint-whitespace
 
 .PHONY: format
 format: ensure-gofumports

diff --git a/chezmoi.io/Makefile b/chezmoi.io/Makefile
@@ -17,38 +17,38 @@ content-docs: \
 	content/docs/related.md \
 	content/docs/templating.md
 
-content/docs/architecture.md: ../docs/ARCHITECTURE.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Architecture" -longtitle="Architecture" < $< > $@ || ( rm -f $@ ; false )
+content/docs/architecture.md: ../docs/ARCHITECTURE.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Architecture" -longtitle="Architecture" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/changes.md: ../docs/CHANGES.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Changes" -longtitle="Changes" < $< > $@ || ( rm -f $@ ; false )
+content/docs/changes.md: ../docs/CHANGES.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Changes" -longtitle="Changes" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/comparison.md: ../docs/COMPARISON.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Comparison" -longtitle="Comparison Guide" < $< > $@ || ( rm -f $@ ; false )
+content/docs/comparison.md: ../docs/COMPARISON.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Comparison" -longtitle="Comparison Guide" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/contributing.md: ../docs/CONTRIBUTING.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Contributing" -longtitle="Contributing Guide" < $< > $@ || ( rm -f $@ ; false )
+content/docs/contributing.md: ../docs/CONTRIBUTING.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Contributing" -longtitle="Contributing Guide" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/faq.md: ../docs/FAQ.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="FAQ" -longtitle="Frequently Asked Questions" < $< > $@ || ( rm -f $@ ; false )
+content/docs/faq.md: ../docs/FAQ.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="FAQ" -longtitle="Frequently Asked Questions" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/how-to.md: ../docs/HOWTO.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="How-To" -longtitle="How-To Guide" < $< > $@ || ( rm -f $@ ; false )
+content/docs/how-to.md: ../docs/HOWTO.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="How-To" -longtitle="How-To Guide" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/install.md: ../docs/INSTALL.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Install" -longtitle="Install Guide" < $< > $@ || ( rm -f $@ ; false )
+content/docs/install.md: ../docs/INSTALL.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Install" -longtitle="Install Guide" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/media.md: ../docs/MEDIA.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Media" -longtitle="Media" < $< > $@ || ( rm -f $@ ; false )
+content/docs/media.md: ../docs/MEDIA.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Media" -longtitle="Media" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/quick-start.md: ../docs/QUICKSTART.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Quick Start" -longtitle="Quick Start Guide" < $< > $@ || ( rm -f $@ ; false )
+content/docs/quick-start.md: ../docs/QUICKSTART.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Quick Start" -longtitle="Quick Start Guide" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/reference.md: ../docs/REFERENCE.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Reference" -longtitle="Reference Manual" < $< > $@ || ( rm -f $@ ; false )
+content/docs/reference.md: ../docs/REFERENCE.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Reference" -longtitle="Reference Manual" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/related.md: ../docs/RELATED.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Related" -longtitle="Related Software" < $< > $@ || ( rm -f $@ ; false )
+content/docs/related.md: ../docs/RELATED.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Related" -longtitle="Related Software" < $< > $@ || ( rm -f $@ ; false )
 
-content/docs/templating.md: ../docs/TEMPLATING.md ../internal/cmd/generate-chezmoi.io-content-docs/main.go Makefile
-	go run ../internal/cmd/generate-chezmoi.io-content-docs -shorttitle="Templating" -longtitle="Templating Guide" < $< > $@ || ( rm -f $@ ; false )
+content/docs/templating.md: ../docs/TEMPLATING.md ../internal/cmds/generate-chezmoi.io-content-docs/main.go Makefile
+	go run ../internal/cmds/generate-chezmoi.io-content-docs -shorttitle="Templating" -longtitle="Templating Guide" < $< > $@ || ( rm -f $@ ; false )
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
@@ -34,10 +34,10 @@ The important directories in chezmoi are:
 
 | Directory | Contents |
 | --------- | -------- |
-| `cmd/` | Code for the `chezmoi` command.  |
 | `docs/` | The documentation single source of truth. Help text, examples, and the [chezmoi.io](https://chezmoi.io) website are generated from the files in this directory, particularly `docs/REFERENCE.md`. |
 | `internal/chezmoi/` | chezmoi's core functionality. |
-| `testdata/scripts/` | High-level tests of chezmoi's commands using [`testscript`](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript). |
+| `internal/cmd/` | Code for the `chezmoi` command.  |
+| `internal/cmd/testdata/scripts/` | High-level tests of chezmoi's commands using [`testscript`](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript). |
 
 ## Key concepts
 
@@ -111,10 +111,10 @@ persistent state. chezmoi can then detect if a third party has updated a target
 since chezmoi last wrote it by comparing the actual state entry in the target
 state with the entry state in the persistent state.
 
-## `cmd/`
+## `internal/cmd/`
 
-`cmd/*cmd.go` contains the code for each individual command and
-`cmd/*templatefuncs.go` contain the template functions.
+`internal/cmd/*cmd.go` contains the code for each individual command and
+`internal/cmd/*templatefuncs.go` contain the template functions.
 
 Commands are defined as methods on the `Config` struct. The `Config` struct is
 large, containing all configuration values read from the config file, command

diff --git a/cmd/addcmd.go → internal/cmd/addcmd.go b/cmd/addcmd.go → internal/cmd/addcmd.go
diff --git a/cmd/addcmd_test.go → internal/cmd/addcmd_test.go b/cmd/addcmd_test.go → internal/cmd/addcmd_test.go
diff --git a/cmd/applycmd.go → internal/cmd/applycmd.go b/cmd/applycmd.go → internal/cmd/applycmd.go
diff --git a/cmd/applycmd_test.go → internal/cmd/applycmd_test.go b/cmd/applycmd_test.go → internal/cmd/applycmd_test.go
diff --git a/cmd/archivecmd.go → internal/cmd/archivecmd.go b/cmd/archivecmd.go → internal/cmd/archivecmd.go
diff --git a/cmd/autobool.go → internal/cmd/autobool.go b/cmd/autobool.go → internal/cmd/autobool.go
diff --git a/cmd/bitwardentemplatefuncs.go → internal/cmd/bitwardentemplatefuncs.go b/cmd/bitwardentemplatefuncs.go → internal/cmd/bitwardentemplatefuncs.go
diff --git a/cmd/catcmd.go → internal/cmd/catcmd.go b/cmd/catcmd.go → internal/cmd/catcmd.go
diff --git a/cmd/cdcmd.go → internal/cmd/cdcmd.go b/cmd/cdcmd.go → internal/cmd/cdcmd.go
diff --git a/cmd/chattrcmd.go → internal/cmd/chattrcmd.go b/cmd/chattrcmd.go → internal/cmd/chattrcmd.go
diff --git a/cmd/chattrcmd_test.go → internal/cmd/chattrcmd_test.go b/cmd/chattrcmd_test.go → internal/cmd/chattrcmd_test.go
diff --git a/cmd/cmd.go → internal/cmd/cmd.go b/cmd/cmd.go → internal/cmd/cmd.go
diff --git a/cmd/cmd_test.go → internal/cmd/cmd_test.go b/cmd/cmd_test.go → internal/cmd/cmd_test.go
diff --git a/cmd/completioncmd.go → internal/cmd/completioncmd.go b/cmd/completioncmd.go → internal/cmd/completioncmd.go
diff --git a/cmd/config.go → internal/cmd/config.go b/cmd/config.go → internal/cmd/config.go
diff --git a/cmd/config_test.go → internal/cmd/config_test.go b/cmd/config_test.go → internal/cmd/config_test.go
diff --git a/cmd/datacmd.go → internal/cmd/datacmd.go b/cmd/datacmd.go → internal/cmd/datacmd.go
diff --git a/cmd/datacmd_test.go → internal/cmd/datacmd_test.go b/cmd/datacmd_test.go → internal/cmd/datacmd_test.go
diff --git a/cmd/dataformat.go → internal/cmd/dataformat.go b/cmd/dataformat.go → internal/cmd/dataformat.go
diff --git a/cmd/diffcmd.go → internal/cmd/diffcmd.go b/cmd/diffcmd.go → internal/cmd/diffcmd.go
diff --git a/cmd/diffcmd_test.go → internal/cmd/diffcmd_test.go b/cmd/diffcmd_test.go → internal/cmd/diffcmd_test.go
diff --git a/cmd/docscmd.go → internal/cmd/docscmd.go b/cmd/docscmd.go → internal/cmd/docscmd.go
diff --git a/cmd/doctorcmd.go → internal/cmd/doctorcmd.go b/cmd/doctorcmd.go → internal/cmd/doctorcmd.go
diff --git a/cmd/dumpcmd.go → internal/cmd/dumpcmd.go b/cmd/dumpcmd.go → internal/cmd/dumpcmd.go
diff --git a/cmd/editcmd.go → internal/cmd/editcmd.go b/cmd/editcmd.go → internal/cmd/editcmd.go
diff --git a/cmd/editconfigcmd.go → internal/cmd/editconfigcmd.go b/cmd/editconfigcmd.go → internal/cmd/editconfigcmd.go
diff --git a/cmd/executetemplatecmd.go → internal/cmd/executetemplatecmd.go b/cmd/executetemplatecmd.go → internal/cmd/executetemplatecmd.go
diff --git a/cmd/forgetcmd.go → internal/cmd/forgetcmd.go b/cmd/forgetcmd.go → internal/cmd/forgetcmd.go
diff --git a/cmd/gitcmd.go → internal/cmd/gitcmd.go b/cmd/gitcmd.go → internal/cmd/gitcmd.go
diff --git a/cmd/githubtemplatefuncs.go → internal/cmd/githubtemplatefuncs.go b/cmd/githubtemplatefuncs.go → internal/cmd/githubtemplatefuncs.go
diff --git a/cmd/gopasstemplatefuncs.go → internal/cmd/gopasstemplatefuncs.go b/cmd/gopasstemplatefuncs.go → internal/cmd/gopasstemplatefuncs.go
diff --git a/cmd/helpcmd.go → internal/cmd/helpcmd.go b/cmd/helpcmd.go → internal/cmd/helpcmd.go
diff --git a/cmd/importcmd.go → internal/cmd/importcmd.go b/cmd/importcmd.go → internal/cmd/importcmd.go
diff --git a/cmd/importcmd_test.go → internal/cmd/importcmd_test.go b/cmd/importcmd_test.go → internal/cmd/importcmd_test.go
diff --git a/cmd/initcmd.go → internal/cmd/initcmd.go b/cmd/initcmd.go → internal/cmd/initcmd.go
diff --git a/cmd/initcmd_test.go → internal/cmd/initcmd_test.go b/cmd/initcmd_test.go → internal/cmd/initcmd_test.go
diff --git a/cmd/keepassxctemplatefuncs.go → internal/cmd/keepassxctemplatefuncs.go b/cmd/keepassxctemplatefuncs.go → internal/cmd/keepassxctemplatefuncs.go
diff --git a/cmd/keyringtemplatefuncs.go → internal/cmd/keyringtemplatefuncs.go b/cmd/keyringtemplatefuncs.go → internal/cmd/keyringtemplatefuncs.go
diff --git a/cmd/lastpasstemplatefuncs.go → internal/cmd/lastpasstemplatefuncs.go b/cmd/lastpasstemplatefuncs.go → internal/cmd/lastpasstemplatefuncs.go
diff --git a/cmd/lastpasstemplatefuncs_test.go → internal/cmd/lastpasstemplatefuncs_test.go b/cmd/lastpasstemplatefuncs_test.go → internal/cmd/lastpasstemplatefuncs_test.go
diff --git a/main_test.go → internal/cmd/main_test.go b/main_test.go → internal/cmd/main_test.go
@@ -1,4 +1,4 @@
-package main
+package cmd_test
 
 import (
 	"bufio"
@@ -20,8 +20,8 @@ import (
 	"github.com/twpayne/go-vfs/v3"
 	"github.com/twpayne/go-vfs/v3/vfst"
 
-	"github.com/twpayne/chezmoi/v2/cmd"
 	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
+	"github.com/twpayne/chezmoi/v2/internal/cmd"
 )
 
 var umaskConditionRx = regexp.MustCompile(`\Aumask:([0-7]{3})\z`)
@@ -275,9 +275,9 @@ func cmdMkGPGConfig(ts *testscript.TestScript, neg bool, args []string) {
 		`encryption = "gpg"`,
 		`[gpg]`,
 		`  args = [`,
-		`    "--homedir", ` + quote(gpgHomeDir) + `,`,
+		`    "--homedir", ` + strconv.Quote(gpgHomeDir) + `,`,
 		`    "--no-tty",`,
-		`    "--passphrase", ` + quote(passphrase) + `,`,
+		`    "--passphrase", ` + strconv.Quote(passphrase) + `,`,
 		`    "--pinentry-mode", "loopback",`,
 		`  ]`,
 	}
@@ -446,10 +446,6 @@ func prependDirToPath(dir, path string) string {
 	return strings.Join(append([]string{dir}, filepath.SplitList(path)...), string(os.PathListSeparator))
 }
 
-func quote(s string) string {
-	return fmt.Sprintf("%q", s)
-}
-
 func setup(env *testscript.Env) error {
 	var (
 		binDir  = filepath.Join(env.WorkDir, "bin")

diff --git a/cmd/managedcmd.go → internal/cmd/managedcmd.go b/cmd/managedcmd.go → internal/cmd/managedcmd.go
diff --git a/cmd/managedcmd_test.go → internal/cmd/managedcmd_test.go b/cmd/managedcmd_test.go → internal/cmd/managedcmd_test.go
diff --git a/cmd/mergecmd.go → internal/cmd/mergecmd.go b/cmd/mergecmd.go → internal/cmd/mergecmd.go
diff --git a/cmd/noupgradecmd.go → internal/cmd/noupgradecmd.go b/cmd/noupgradecmd.go → internal/cmd/noupgradecmd.go
diff --git a/cmd/onepasswordtemplatefuncs.go → internal/cmd/onepasswordtemplatefuncs.go b/cmd/onepasswordtemplatefuncs.go → internal/cmd/onepasswordtemplatefuncs.go
diff --git a/cmd/passtemplatefuncs.go → internal/cmd/passtemplatefuncs.go b/cmd/passtemplatefuncs.go → internal/cmd/passtemplatefuncs.go
diff --git a/cmd/purgecmd.go → internal/cmd/purgecmd.go b/cmd/purgecmd.go → internal/cmd/purgecmd.go
diff --git a/cmd/readdcmd.go → internal/cmd/readdcmd.go b/cmd/readdcmd.go → internal/cmd/readdcmd.go
diff --git a/cmd/removecmd.go → internal/cmd/removecmd.go b/cmd/removecmd.go → internal/cmd/removecmd.go
diff --git a/cmd/secretcmd.go → internal/cmd/secretcmd.go b/cmd/secretcmd.go → internal/cmd/secretcmd.go
diff --git a/cmd/secretkeyringcmd.go → internal/cmd/secretkeyringcmd.go b/cmd/secretkeyringcmd.go → internal/cmd/secretkeyringcmd.go
diff --git a/cmd/secrettemplatefuncs.go → internal/cmd/secrettemplatefuncs.go b/cmd/secrettemplatefuncs.go → internal/cmd/secrettemplatefuncs.go
diff --git a/cmd/sourcepathcmd.go → internal/cmd/sourcepathcmd.go b/cmd/sourcepathcmd.go → internal/cmd/sourcepathcmd.go
diff --git a/cmd/statecmd.go → internal/cmd/statecmd.go b/cmd/statecmd.go → internal/cmd/statecmd.go
diff --git a/cmd/statuscmd.go → internal/cmd/statuscmd.go b/cmd/statuscmd.go → internal/cmd/statuscmd.go
diff --git a/cmd/statuscmd_test.go → internal/cmd/statuscmd_test.go b/cmd/statuscmd_test.go → internal/cmd/statuscmd_test.go
diff --git a/cmd/templatefuncs.go → internal/cmd/templatefuncs.go b/cmd/templatefuncs.go → internal/cmd/templatefuncs.go
diff --git a/cmd/terminal.go → internal/cmd/terminal.go b/cmd/terminal.go → internal/cmd/terminal.go
diff --git a/testdata/scripts/add.txt → internal/cmd/testdata/scripts/add.txt b/testdata/scripts/add.txt → internal/cmd/testdata/scripts/add.txt
@@ -36,7 +36,7 @@ chezmoi add $HOME${/}.symlink
 cmp $CHEZMOISOURCEDIR/symlink_dot_symlink golden/symlink_dot_symlink
 
 # test adding a symlink with a separator
-symlink $HOME${/}.symlink2 -> .dir${/}subdir${/}file
+symlink $HOME/.symlink2 -> .dir/subdir/file
 chezmoi add $HOME${/}.symlink2
 cmp $CHEZMOISOURCEDIR/symlink_dot_symlink2 golden/symlink_dot_symlink
 

diff --git a/testdata/scripts/addattributes.txt → ...al/cmd/testdata/scripts/addattributes.txt b/testdata/scripts/addattributes.txt → ...al/cmd/testdata/scripts/addattributes.txt
diff --git a/testdata/scripts/addautotemplate.txt → .../cmd/testdata/scripts/addautotemplate.txt b/testdata/scripts/addautotemplate.txt → .../cmd/testdata/scripts/addautotemplate.txt
diff --git a/testdata/scripts/addencrypted.txt → ...nal/cmd/testdata/scripts/addencrypted.txt b/testdata/scripts/addencrypted.txt → ...nal/cmd/testdata/scripts/addencrypted.txt
diff --git a/testdata/scripts/ageencryption.txt → ...al/cmd/testdata/scripts/ageencryption.txt b/testdata/scripts/ageencryption.txt → ...al/cmd/testdata/scripts/ageencryption.txt
diff --git a/testdata/scripts/apply.txt → internal/cmd/testdata/scripts/apply.txt b/testdata/scripts/apply.txt → internal/cmd/testdata/scripts/apply.txt
diff --git a/testdata/scripts/applychmod.txt → internal/cmd/testdata/scripts/applychmod.txt b/testdata/scripts/applychmod.txt → internal/cmd/testdata/scripts/applychmod.txt
@@ -5,7 +5,7 @@ mkhomedir
 mksourcedir
 
 # test change file mode
-chmod 777 $HOME${/}.file
+chmod 777 $HOME/.file
 chezmoi apply --force
 cmpmod 666 $HOME/.file
 

diff --git a/testdata/scripts/applyexact.txt → internal/cmd/testdata/scripts/applyexact.txt b/testdata/scripts/applyexact.txt → internal/cmd/testdata/scripts/applyexact.txt
diff --git a/testdata/scripts/applyremove.txt → ...rnal/cmd/testdata/scripts/applyremove.txt b/testdata/scripts/applyremove.txt → ...rnal/cmd/testdata/scripts/applyremove.txt
diff --git a/testdata/scripts/applyskipencrypted.txt → ...d/testdata/scripts/applyskipencrypted.txt b/testdata/scripts/applyskipencrypted.txt → ...d/testdata/scripts/applyskipencrypted.txt
diff --git a/testdata/scripts/applysourcepath.txt → .../cmd/testdata/scripts/applysourcepath.txt b/testdata/scripts/applysourcepath.txt → .../cmd/testdata/scripts/applysourcepath.txt
diff --git a/testdata/scripts/applystate.txt → internal/cmd/testdata/scripts/applystate.txt b/testdata/scripts/applystate.txt → internal/cmd/testdata/scripts/applystate.txt
diff --git a/testdata/scripts/applytype.txt → internal/cmd/testdata/scripts/applytype.txt b/testdata/scripts/applytype.txt → internal/cmd/testdata/scripts/applytype.txt
diff --git a/testdata/scripts/archivetar.txt → internal/cmd/testdata/scripts/archivetar.txt b/testdata/scripts/archivetar.txt → internal/cmd/testdata/scripts/archivetar.txt
diff --git a/testdata/scripts/archivezip.txt → internal/cmd/testdata/scripts/archivezip.txt b/testdata/scripts/archivezip.txt → internal/cmd/testdata/scripts/archivezip.txt
diff --git a/testdata/scripts/autocommit.txt → internal/cmd/testdata/scripts/autocommit.txt b/testdata/scripts/autocommit.txt → internal/cmd/testdata/scripts/autocommit.txt
diff --git a/testdata/scripts/autopush.txt → internal/cmd/testdata/scripts/autopush.txt b/testdata/scripts/autopush.txt → internal/cmd/testdata/scripts/autopush.txt
diff --git a/testdata/scripts/bitwarden.txt → internal/cmd/testdata/scripts/bitwarden.txt b/testdata/scripts/bitwarden.txt → internal/cmd/testdata/scripts/bitwarden.txt
diff --git a/testdata/scripts/builtingit.txt → internal/cmd/testdata/scripts/builtingit.txt b/testdata/scripts/builtingit.txt → internal/cmd/testdata/scripts/builtingit.txt
diff --git a/testdata/scripts/cat.txt → internal/cmd/testdata/scripts/cat.txt b/testdata/scripts/cat.txt → internal/cmd/testdata/scripts/cat.txt
diff --git a/testdata/scripts/cd_unix.txt → internal/cmd/testdata/scripts/cd_unix.txt b/testdata/scripts/cd_unix.txt → internal/cmd/testdata/scripts/cd_unix.txt
diff --git a/testdata/scripts/cd_windows.txt → internal/cmd/testdata/scripts/cd_windows.txt b/testdata/scripts/cd_windows.txt → internal/cmd/testdata/scripts/cd_windows.txt
diff --git a/testdata/scripts/chattr.txt → internal/cmd/testdata/scripts/chattr.txt b/testdata/scripts/chattr.txt → internal/cmd/testdata/scripts/chattr.txt
diff --git a/testdata/scripts/completion.txt → internal/cmd/testdata/scripts/completion.txt b/testdata/scripts/completion.txt → internal/cmd/testdata/scripts/completion.txt
diff --git a/testdata/scripts/config.txt → internal/cmd/testdata/scripts/config.txt b/testdata/scripts/config.txt → internal/cmd/testdata/scripts/config.txt
diff --git a/testdata/scripts/configstate.txt → ...rnal/cmd/testdata/scripts/configstate.txt b/testdata/scripts/configstate.txt → ...rnal/cmd/testdata/scripts/configstate.txt
diff --git a/testdata/scripts/data.txt → internal/cmd/testdata/scripts/data.txt b/testdata/scripts/data.txt → internal/cmd/testdata/scripts/data.txt
diff --git a/testdata/scripts/diff.txt → internal/cmd/testdata/scripts/diff.txt b/testdata/scripts/diff.txt → internal/cmd/testdata/scripts/diff.txt
diff --git a/testdata/scripts/docs.txt → internal/cmd/testdata/scripts/docs.txt b/testdata/scripts/docs.txt → internal/cmd/testdata/scripts/docs.txt
diff --git a/testdata/scripts/doctor.txt → internal/cmd/testdata/scripts/doctor.txt b/testdata/scripts/doctor.txt → internal/cmd/testdata/scripts/doctor.txt
diff --git a/testdata/scripts/dumpjson.txt → internal/cmd/testdata/scripts/dumpjson.txt b/testdata/scripts/dumpjson.txt → internal/cmd/testdata/scripts/dumpjson.txt
diff --git a/testdata/scripts/dumpyaml.txt → internal/cmd/testdata/scripts/dumpyaml.txt b/testdata/scripts/dumpyaml.txt → internal/cmd/testdata/scripts/dumpyaml.txt
diff --git a/testdata/scripts/edgecases.txt → internal/cmd/testdata/scripts/edgecases.txt b/testdata/scripts/edgecases.txt → internal/cmd/testdata/scripts/edgecases.txt
diff --git a/testdata/scripts/edit.txt → internal/cmd/testdata/scripts/edit.txt b/testdata/scripts/edit.txt → internal/cmd/testdata/scripts/edit.txt
diff --git a/testdata/scripts/editconfig.txt → internal/cmd/testdata/scripts/editconfig.txt b/testdata/scripts/editconfig.txt → internal/cmd/testdata/scripts/editconfig.txt
diff --git a/testdata/scripts/errors.txt → internal/cmd/testdata/scripts/errors.txt b/testdata/scripts/errors.txt → internal/cmd/testdata/scripts/errors.txt
diff --git a/testdata/scripts/exclude.txt → internal/cmd/testdata/scripts/exclude.txt b/testdata/scripts/exclude.txt → internal/cmd/testdata/scripts/exclude.txt
diff --git a/testdata/scripts/executetemplate.txt → .../cmd/testdata/scripts/executetemplate.txt b/testdata/scripts/executetemplate.txt → .../cmd/testdata/scripts/executetemplate.txt
diff --git a/testdata/scripts/forget.txt → internal/cmd/testdata/scripts/forget.txt b/testdata/scripts/forget.txt → internal/cmd/testdata/scripts/forget.txt
diff --git a/testdata/scripts/git.txt → internal/cmd/testdata/scripts/git.txt b/testdata/scripts/git.txt → internal/cmd/testdata/scripts/git.txt
diff --git a/testdata/scripts/gopass.txt → internal/cmd/testdata/scripts/gopass.txt b/testdata/scripts/gopass.txt → internal/cmd/testdata/scripts/gopass.txt
diff --git a/testdata/scripts/gpg.txt → internal/cmd/testdata/scripts/gpg.txt b/testdata/scripts/gpg.txt → internal/cmd/testdata/scripts/gpg.txt
diff --git a/testdata/scripts/gpgencryption.txt → ...al/cmd/testdata/scripts/gpgencryption.txt b/testdata/scripts/gpgencryption.txt → ...al/cmd/testdata/scripts/gpgencryption.txt
diff --git a/testdata/scripts/gpgencryption_symmetric.txt → ...tdata/scripts/gpgencryption_symmetric.txt b/testdata/scripts/gpgencryption_symmetric.txt → ...tdata/scripts/gpgencryption_symmetric.txt
diff --git a/testdata/scripts/help.txt → internal/cmd/testdata/scripts/help.txt b/testdata/scripts/help.txt → internal/cmd/testdata/scripts/help.txt
diff --git a/testdata/scripts/ignore.txt → internal/cmd/testdata/scripts/ignore.txt b/testdata/scripts/ignore.txt → internal/cmd/testdata/scripts/ignore.txt
diff --git a/testdata/scripts/import.txt → internal/cmd/testdata/scripts/import.txt b/testdata/scripts/import.txt → internal/cmd/testdata/scripts/import.txt
diff --git a/testdata/scripts/init.txt → internal/cmd/testdata/scripts/init.txt b/testdata/scripts/init.txt → internal/cmd/testdata/scripts/init.txt
diff --git a/testdata/scripts/issue-1161.txt → internal/cmd/testdata/scripts/issue-1161.txt b/testdata/scripts/issue-1161.txt → internal/cmd/testdata/scripts/issue-1161.txt
diff --git a/testdata/scripts/issue-1213.txt → internal/cmd/testdata/scripts/issue-1213.txt b/testdata/scripts/issue-1213.txt → internal/cmd/testdata/scripts/issue-1213.txt
diff --git a/testdata/scripts/issue-796.txt → internal/cmd/testdata/scripts/issue-796.txt b/testdata/scripts/issue-796.txt → internal/cmd/testdata/scripts/issue-796.txt
diff --git a/testdata/scripts/keep-going.txt → internal/cmd/testdata/scripts/keep-going.txt b/testdata/scripts/keep-going.txt → internal/cmd/testdata/scripts/keep-going.txt
diff --git a/testdata/scripts/keepassxc.txt → internal/cmd/testdata/scripts/keepassxc.txt b/testdata/scripts/keepassxc.txt → internal/cmd/testdata/scripts/keepassxc.txt
diff --git a/testdata/scripts/lastpass.txt → internal/cmd/testdata/scripts/lastpass.txt b/testdata/scripts/lastpass.txt → internal/cmd/testdata/scripts/lastpass.txt
diff --git a/testdata/scripts/managed.txt → internal/cmd/testdata/scripts/managed.txt b/testdata/scripts/managed.txt → internal/cmd/testdata/scripts/managed.txt
diff --git a/testdata/scripts/merge.txt → internal/cmd/testdata/scripts/merge.txt b/testdata/scripts/merge.txt → internal/cmd/testdata/scripts/merge.txt
@@ -10,7 +10,7 @@ stdout ^${HOME@R}/\.file\s+${CHEZMOISOURCEDIR@R}/dot_file\s+${WORK@R}/.*/\.file$
 # test that chezmoi merge falls back to a two-way merge when the template is invalid
 # FIXME the following test fails
 # chezmoi merge $HOME${/}.invalid_template
-# stdout ^${HOME@R}/\.invalid_template\s+${CHEZMOISOURCEDIR}/dot_invalid_template\.tmpl$
+# stdout ^${HOME@R}/\.invalid_template\s+$CHEZMOISOURCEDIR/dot_invalid_template\.tmpl$
 
 -- bin/vimdiff --
 #!/bin/sh

diff --git a/testdata/scripts/modify.txt → internal/cmd/testdata/scripts/modify.txt b/testdata/scripts/modify.txt → internal/cmd/testdata/scripts/modify.txt
diff --git a/testdata/scripts/noencryption.txt → ...nal/cmd/testdata/scripts/noencryption.txt b/testdata/scripts/noencryption.txt → ...nal/cmd/testdata/scripts/noencryption.txt
diff --git a/testdata/scripts/onepassword.txt → ...rnal/cmd/testdata/scripts/onepassword.txt b/testdata/scripts/onepassword.txt → ...rnal/cmd/testdata/scripts/onepassword.txt
diff --git a/testdata/scripts/options.txt → internal/cmd/testdata/scripts/options.txt b/testdata/scripts/options.txt → internal/cmd/testdata/scripts/options.txt
diff --git a/testdata/scripts/pass.txt → internal/cmd/testdata/scripts/pass.txt b/testdata/scripts/pass.txt → internal/cmd/testdata/scripts/pass.txt
diff --git a/testdata/scripts/purge.txt → internal/cmd/testdata/scripts/purge.txt b/testdata/scripts/purge.txt → internal/cmd/testdata/scripts/purge.txt
diff --git a/testdata/scripts/re-add.txt → internal/cmd/testdata/scripts/re-add.txt b/testdata/scripts/re-add.txt → internal/cmd/testdata/scripts/re-add.txt
@@ -3,9 +3,9 @@ mksourcedir
 
 # test that chezmoi re-add adds all modified files
 chezmoi apply --force
-edit $HOME${/}.file
-edit $HOME${/}.dir/file
-edit $HOME${/}.dir/subdir/file
+edit $HOME/.file
+edit $HOME/.dir/file
+edit $HOME/.dir/subdir/file
 chezmoi re-add
 grep '# edited' $CHEZMOISOURCEDIR/dot_file
 grep '# edited' $CHEZMOISOURCEDIR/dot_dir/file

diff --git a/testdata/scripts/remove.txt → internal/cmd/testdata/scripts/remove.txt b/testdata/scripts/remove.txt → internal/cmd/testdata/scripts/remove.txt
diff --git a/testdata/scripts/runscriptdir_unix.txt → ...md/testdata/scripts/runscriptdir_unix.txt b/testdata/scripts/runscriptdir_unix.txt → ...md/testdata/scripts/runscriptdir_unix.txt
diff --git a/testdata/scripts/script_unix.txt → ...rnal/cmd/testdata/scripts/script_unix.txt b/testdata/scripts/script_unix.txt → ...rnal/cmd/testdata/scripts/script_unix.txt
diff --git a/testdata/scripts/script_windows.txt → ...l/cmd/testdata/scripts/script_windows.txt b/testdata/scripts/script_windows.txt → ...l/cmd/testdata/scripts/script_windows.txt
diff --git a/testdata/scripts/scriptonce_unix.txt → .../cmd/testdata/scripts/scriptonce_unix.txt b/testdata/scripts/scriptonce_unix.txt → .../cmd/testdata/scripts/scriptonce_unix.txt
diff --git a/testdata/scripts/scriptonce_windows.txt → ...d/testdata/scripts/scriptonce_windows.txt b/testdata/scripts/scriptonce_windows.txt → ...d/testdata/scripts/scriptonce_windows.txt
diff --git a/testdata/scripts/scriptorder_unix.txt → ...cmd/testdata/scripts/scriptorder_unix.txt b/testdata/scripts/scriptorder_unix.txt → ...cmd/testdata/scripts/scriptorder_unix.txt
diff --git a/testdata/scripts/scriptorder_windows.txt → .../testdata/scripts/scriptorder_windows.txt b/testdata/scripts/scriptorder_windows.txt → .../testdata/scripts/scriptorder_windows.txt
diff --git a/testdata/scripts/scriptsubdir_unix.txt → ...md/testdata/scripts/scriptsubdir_unix.txt b/testdata/scripts/scriptsubdir_unix.txt → ...md/testdata/scripts/scriptsubdir_unix.txt
diff --git a/testdata/scripts/scriptsubdir_windows.txt → ...testdata/scripts/scriptsubdir_windows.txt b/testdata/scripts/scriptsubdir_windows.txt → ...testdata/scripts/scriptsubdir_windows.txt
diff --git a/testdata/scripts/secret.txt → internal/cmd/testdata/scripts/secret.txt b/testdata/scripts/secret.txt → internal/cmd/testdata/scripts/secret.txt
diff --git a/testdata/scripts/sourcedir.txt → internal/cmd/testdata/scripts/sourcedir.txt b/testdata/scripts/sourcedir.txt → internal/cmd/testdata/scripts/sourcedir.txt
diff --git a/testdata/scripts/sourcepath.txt → internal/cmd/testdata/scripts/sourcepath.txt b/testdata/scripts/sourcepath.txt → internal/cmd/testdata/scripts/sourcepath.txt
diff --git a/testdata/scripts/state.txt → internal/cmd/testdata/scripts/state.txt b/testdata/scripts/state.txt → internal/cmd/testdata/scripts/state.txt
diff --git a/testdata/scripts/state_unix.txt → internal/cmd/testdata/scripts/state_unix.txt b/testdata/scripts/state_unix.txt → internal/cmd/testdata/scripts/state_unix.txt
diff --git a/testdata/scripts/state_windows.txt → ...al/cmd/testdata/scripts/state_windows.txt b/testdata/scripts/state_windows.txt → ...al/cmd/testdata/scripts/state_windows.txt
diff --git a/testdata/scripts/status.txt → internal/cmd/testdata/scripts/status.txt b/testdata/scripts/status.txt → internal/cmd/testdata/scripts/status.txt
diff --git a/testdata/scripts/symlinks.txt → internal/cmd/testdata/scripts/symlinks.txt b/testdata/scripts/symlinks.txt → internal/cmd/testdata/scripts/symlinks.txt
@@ -8,19 +8,19 @@ chezmoi apply $HOME${/}.template
 cmp $HOME/.template $HOME/.file
 
 # test that chezmoi add --template-symlinks replaces absolute symlinks, pointing to files inside home, with templates
-symlink ${HOME}${/}.symlink_absolute -> $HOME/.dir/subdir/file
+symlink $HOME/.symlink_absolute -> $HOME/.dir/subdir/file
 chezmoi add --template-symlinks $HOME${/}.symlink_absolute
 cmp $CHEZMOISOURCEDIR/symlink_dot_symlink_absolute.tmpl golden/symlink_dot_symlink_absolute.tmpl
 
 # test that chezmoi add --template-symlinks replaces absolute symlinks, pointing to files inside the source directory, with templates
-symlink $HOME${/}.symlink_source -> $CHEZMOISOURCEDIR/.dir/subdir/file
+symlink $HOME/.symlink_source -> $CHEZMOISOURCEDIR/.dir/subdir/file
 chezmoi add --template-symlinks $HOME${/}.symlink_source
 cmp $CHEZMOISOURCEDIR/symlink_dot_symlink_source.tmpl golden/symlink_dot_symlink_source.tmpl
 
 chhome home2/user
 
 # test that chezmoi add reads add.templateSymlinks from the config file
-symlink ${HOME}${/}.symlink_absolute -> $HOME/.dir/subdir/file
+symlink $HOME/.symlink_absolute -> $HOME/.dir/subdir/file
 chezmoi add --template-symlinks $HOME${/}.symlink_absolute
 cmp $CHEZMOISOURCEDIR/symlink_dot_symlink_absolute.tmpl golden/symlink_dot_symlink_absolute.tmpl
 

diff --git a/testdata/scripts/templatedata.txt → ...nal/cmd/testdata/scripts/templatedata.txt b/testdata/scripts/templatedata.txt → ...nal/cmd/testdata/scripts/templatedata.txt
diff --git a/testdata/scripts/templatefuncs.txt → ...al/cmd/testdata/scripts/templatefuncs.txt b/testdata/scripts/templatefuncs.txt → ...al/cmd/testdata/scripts/templatefuncs.txt
@@ -27,7 +27,7 @@ stdout a${/}b
 
 # test lookPath template function
 chezmoi execute-template '{{ lookPath "go" }}'
-stdout go${exe}
+stdout go$exe
 
 # test stat template function
 chezmoi execute-template '{{ (stat ".").isDir }}'

diff --git a/testdata/scripts/tilde.txt → internal/cmd/testdata/scripts/tilde.txt b/testdata/scripts/tilde.txt → internal/cmd/testdata/scripts/tilde.txt
diff --git a/testdata/scripts/umask.txt → internal/cmd/testdata/scripts/umask.txt b/testdata/scripts/umask.txt → internal/cmd/testdata/scripts/umask.txt
diff --git a/testdata/scripts/unmanaged.txt → internal/cmd/testdata/scripts/unmanaged.txt b/testdata/scripts/unmanaged.txt → internal/cmd/testdata/scripts/unmanaged.txt
diff --git a/testdata/scripts/update.txt → internal/cmd/testdata/scripts/update.txt b/testdata/scripts/update.txt → internal/cmd/testdata/scripts/update.txt
diff --git a/testdata/scripts/vault.txt → internal/cmd/testdata/scripts/vault.txt b/testdata/scripts/vault.txt → internal/cmd/testdata/scripts/vault.txt
diff --git a/testdata/scripts/verify.txt → internal/cmd/testdata/scripts/verify.txt b/testdata/scripts/verify.txt → internal/cmd/testdata/scripts/verify.txt
diff --git a/testdata/scripts/version.txt → internal/cmd/testdata/scripts/version.txt b/testdata/scripts/version.txt → internal/cmd/testdata/scripts/version.txt
diff --git a/cmd/unmanagedcmd.go → internal/cmd/unmanagedcmd.go b/cmd/unmanagedcmd.go → internal/cmd/unmanagedcmd.go
diff --git a/cmd/updatecmd.go → internal/cmd/updatecmd.go b/cmd/updatecmd.go → internal/cmd/updatecmd.go
diff --git a/cmd/upgradecmd.go → internal/cmd/upgradecmd.go b/cmd/upgradecmd.go → internal/cmd/upgradecmd.go
diff --git a/cmd/upgradecmd_unix.go → internal/cmd/upgradecmd_unix.go b/cmd/upgradecmd_unix.go → internal/cmd/upgradecmd_unix.go
diff --git a/cmd/util.go → internal/cmd/util.go b/cmd/util.go → internal/cmd/util.go
diff --git a/cmd/util_test.go → internal/cmd/util_test.go b/cmd/util_test.go → internal/cmd/util_test.go
diff --git a/cmd/util_unix.go → internal/cmd/util_unix.go b/cmd/util_unix.go → internal/cmd/util_unix.go
diff --git a/cmd/util_windows.go → internal/cmd/util_windows.go b/cmd/util_windows.go → internal/cmd/util_windows.go
diff --git a/cmd/vaulttemplatefuncs.go → internal/cmd/vaulttemplatefuncs.go b/cmd/vaulttemplatefuncs.go → internal/cmd/vaulttemplatefuncs.go
diff --git a/cmd/verifycmd.go → internal/cmd/verifycmd.go b/cmd/verifycmd.go → internal/cmd/verifycmd.go
diff --git a/cmd/verifycmd_test.go → internal/cmd/verifycmd_test.go b/cmd/verifycmd_test.go → internal/cmd/verifycmd_test.go
diff --git a/.../generate-chezmoi.io-content-docs/main.go → .../generate-chezmoi.io-content-docs/main.go b/.../generate-chezmoi.io-content-docs/main.go → .../generate-chezmoi.io-content-docs/main.go
diff --git a/...l/cmd/generate-install.sh/install.sh.tmpl → .../cmds/generate-install.sh/install.sh.tmpl b/...l/cmd/generate-install.sh/install.sh.tmpl → .../cmds/generate-install.sh/install.sh.tmpl
diff --git a/internal/cmd/generate-install.sh/main.go → internal/cmds/generate-install.sh/main.go b/internal/cmd/generate-install.sh/main.go → internal/cmds/generate-install.sh/main.go
@@ -111,7 +111,7 @@ func run() error {
 	})
 
 	// Generate install.sh.
-	installShTemplate, err := template.ParseFiles("internal/cmd/generate-install.sh/install.sh.tmpl")
+	installShTemplate, err := template.ParseFiles("internal/cmds/generate-install.sh/install.sh.tmpl")
 	if err != nil {
 		return err
 	}

diff --git a/internal/cmd/lint-whitespace/main.go → internal/cmds/lint-whitespace/main.go b/internal/cmd/lint-whitespace/main.go → internal/cmds/lint-whitespace/main.go
diff --git a/main.go b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/twpayne/chezmoi/v2/cmd"
+	"github.com/twpayne/chezmoi/v2/internal/cmd"
 )
 
 var (