From 0254d2d4ede01da65a0303512b8ddc254e3add06 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 31 Jan 2022 02:06:44 +0000
Subject: [PATCH] chore: Move internal commands back into internal directory

---
 .github/workflows/main.yml                                 | 2 +-
 .golangci.yml                                              | 2 +-
 Makefile                                                   | 2 +-
 {pkg => internal}/cmds/generate-install.sh/install.sh.tmpl | 0
 {pkg => internal}/cmds/generate-install.sh/main.go         | 2 +-
 {pkg => internal}/cmds/generate-install.sh/main_test.go    | 0
 {pkg => internal}/cmds/lint-whitespace/main.go             | 0
 {pkg => internal}/cmds/lint-whitespace/main_test.go        | 0
 main.go                                                    | 2 +-
 9 files changed, 5 insertions(+), 5 deletions(-)
 rename {pkg => internal}/cmds/generate-install.sh/install.sh.tmpl (100%)
 rename {pkg => internal}/cmds/generate-install.sh/main.go (96%)
 rename {pkg => internal}/cmds/generate-install.sh/main_test.go (100%)
 rename {pkg => internal}/cmds/lint-whitespace/main.go (100%)
 rename {pkg => internal}/cmds/lint-whitespace/main_test.go (100%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0a1b61b7530..b680f7dd4c5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -466,7 +466,7 @@ jobs:
         ignore: completions
     - name: Whitespace
       run: |
-        go run ./pkg/cmds/lint-whitespace
+        go run ./internal/cmds/lint-whitespace
     - name: Typos
       run: |
         go install github.com/twpayne/findtypos@v0.0.1
diff --git a/.golangci.yml b/.golangci.yml
index 3f6df742b02..86999aaebba 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -121,7 +121,7 @@ issues:
     - forbidigo
     - gosec
     - lll
-    path: ^pkg/cmds/
+    path: ^internal/cmds/
   - linters:
     - gosec
     - lll
diff --git a/Makefile b/Makefile
index 5d3960577b4..01cdb897ce4 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ generate:
 .PHONY: lint
 lint: ensure-golangci-lint
 	./bin/golangci-lint run
-	${GO} run ./pkg/cmds/lint-whitespace
+	${GO} run ./internal/cmds/lint-whitespace
 
 .PHONY: format
 format: ensure-gofumpt
diff --git a/pkg/cmds/generate-install.sh/install.sh.tmpl b/internal/cmds/generate-install.sh/install.sh.tmpl
similarity index 100%
rename from pkg/cmds/generate-install.sh/install.sh.tmpl
rename to internal/cmds/generate-install.sh/install.sh.tmpl
diff --git a/pkg/cmds/generate-install.sh/main.go b/internal/cmds/generate-install.sh/main.go
similarity index 96%
rename from pkg/cmds/generate-install.sh/main.go
rename to internal/cmds/generate-install.sh/main.go
index 87a8d47b93c..41e932bfa32 100644
--- a/pkg/cmds/generate-install.sh/main.go
+++ b/internal/cmds/generate-install.sh/main.go
@@ -113,7 +113,7 @@ func run() error {
 	})
 
 	// Generate install.sh.
-	installShTemplate, err := template.ParseFiles("pkg/cmds/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/pkg/cmds/generate-install.sh/main_test.go b/internal/cmds/generate-install.sh/main_test.go
similarity index 100%
rename from pkg/cmds/generate-install.sh/main_test.go
rename to internal/cmds/generate-install.sh/main_test.go
diff --git a/pkg/cmds/lint-whitespace/main.go b/internal/cmds/lint-whitespace/main.go
similarity index 100%
rename from pkg/cmds/lint-whitespace/main.go
rename to internal/cmds/lint-whitespace/main.go
diff --git a/pkg/cmds/lint-whitespace/main_test.go b/internal/cmds/lint-whitespace/main_test.go
similarity index 100%
rename from pkg/cmds/lint-whitespace/main_test.go
rename to internal/cmds/lint-whitespace/main_test.go
diff --git a/main.go b/main.go
index 1891fd96987..5220872df02 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,7 @@
 //go:generate go run . completion fish -o completions/chezmoi.fish
 //go:generate go run . completion powershell -o completions/chezmoi.ps1
 //go:generate go run . completion zsh -o completions/chezmoi.zsh
-//go:generate go run ./pkg/cmds/generate-install.sh -o assets/scripts/install.sh
+//go:generate go run ./internal/cmds/generate-install.sh -o assets/scripts/install.sh
 
 package main