chore(mk): clean ignored directories in make clean

Signed-off-by: kilianpaquier <kilian@kilianpaquier.com>
kilianpaquier · Dec 21, 2024 · 35aa2e3 · 35aa2e3
1 parent d042bb9
commit 35aa2e3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git a/internal/cobra/upgrade.go b/internal/cobra/upgrade.go
@@ -18,8 +18,6 @@ var (
 		Use:   "upgrade",
 		Short: "Upgrade or install craft",
 		Run: func(cmd *cobra.Command, _ []string) {
-			ctx := cmd.Context()
-
 			options := []upgrade.RunOption{
 				upgrade.WithDestination(dest),
 				upgrade.WithHTTPClient(cleanhttp.DefaultClient()),
@@ -28,20 +26,17 @@ var (
 				upgrade.WithPrereleases(prereleases),
 			}
 
-			version, err := upgrade.Run(ctx, "craft", version, upgrade.GithubReleases("kilianpaquier", "craft"), options...)
+			version, err := upgrade.Run(cmd.Context(), "craft", version, upgrade.GithubReleases("kilianpaquier", "craft"), options...)
 			if err != nil {
 				switch {
-				case errors.Is(err, upgrade.ErrInvalidOptions):
-					logger.Fatal(err)
 				case errors.Is(err, upgrade.ErrNoNewVersion):
 					logger.Info(err)
-					return
 				case errors.Is(err, upgrade.ErrAlreadyInstalled):
 					logger.Infof("version '%s' is already installed", version)
-					return
 				default:
 					logger.Fatal(err)
 				}
+				return
 			}
 			logger.Infof("successfully installed version '%s'", version)
 		},

diff --git a/pkg/generate/_templates/scripts/craft.mk.tmpl b/pkg/generate/_templates/scripts/craft.mk.tmpl
@@ -9,4 +9,4 @@ clean:
 {{- if hasKey .Languages "golang" }}
 	@go clean
 {{- end }}
-	@git clean -Xf ./*
+	@git clean -dfX
diff --git a/scripts/craft.mk b/scripts/craft.mk
@@ -7,4 +7,4 @@ generate:
 .PHONY: clean
 clean:
 	@go clean
-	@git clean -Xf ./*
+	@git clean -dfX
diff --git a/testdata/TestRun_Golang/success_cli/github/scripts/craft.mk b/testdata/TestRun_Golang/success_cli/github/scripts/craft.mk
@@ -7,4 +7,4 @@ generate:
 .PHONY: clean
 clean:
 	@go clean
-	@git clean -Xf ./*
+	@git clean -dfX
diff --git a/testdata/TestRun_Golang/success_cli/gitlab/scripts/craft.mk b/testdata/TestRun_Golang/success_cli/gitlab/scripts/craft.mk
@@ -7,4 +7,4 @@ generate:
 .PHONY: clean
 clean:
 	@go clean
-	@git clean -Xf ./*
+	@git clean -dfX
diff --git a/testdata/TestRun_Golang/success_library/github/scripts/craft.mk b/testdata/TestRun_Golang/success_library/github/scripts/craft.mk
@@ -7,4 +7,4 @@ generate:
 .PHONY: clean
 clean:
 	@go clean
-	@git clean -Xf ./*
+	@git clean -dfX
diff --git a/testdata/TestRun_Golang/success_library/gitlab/scripts/craft.mk b/testdata/TestRun_Golang/success_library/gitlab/scripts/craft.mk
@@ -7,4 +7,4 @@ generate:
 .PHONY: clean
 clean:
 	@go clean
-	@git clean -Xf ./*
+	@git clean -dfX