chore: Move internal commands back into internal directory

pckilgore · Jan 31, 2022 · 0254d2d · 0254d2d
1 parent 5689a9f
commit 0254d2d
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -121,7 +121,7 @@ issues:
     - forbidigo
     - gosec
     - lll
-    path: ^pkg/cmds/
+    path: ^internal/cmds/
   - linters:
     - gosec
     - lll

diff --git 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 → .../cmds/generate-install.sh/install.sh.tmpl b/pkg/cmds/generate-install.sh/install.sh.tmpl → .../cmds/generate-install.sh/install.sh.tmpl
diff --git a/pkg/cmds/generate-install.sh/main.go → internal/cmds/generate-install.sh/main.go b/pkg/cmds/generate-install.sh/main.go → 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 → ...nal/cmds/generate-install.sh/main_test.go b/pkg/cmds/generate-install.sh/main_test.go → ...nal/cmds/generate-install.sh/main_test.go
diff --git a/pkg/cmds/lint-whitespace/main.go → internal/cmds/lint-whitespace/main.go b/pkg/cmds/lint-whitespace/main.go → internal/cmds/lint-whitespace/main.go
diff --git a/pkg/cmds/lint-whitespace/main_test.go → internal/cmds/lint-whitespace/main_test.go b/pkg/cmds/lint-whitespace/main_test.go → internal/cmds/lint-whitespace/main_test.go
diff --git 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