Merge pull request #73 from nao1215/change-bash-completion-file-path

Issue #72: Change bash completion file path
nao1215 · Feb 23, 2023 · 60484c4 · 60484c4
2 parents 360e9b8 + 0a081f4
commit 60484c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -770,7 +770,7 @@ func TestExecute_Completion(t *testing.T) {
 		os.Args = []string{"gup", "completion"}
 		Execute()
 
-		bash := filepath.Join(os.Getenv("HOME"), ".bash_completion")
+		bash := filepath.Join(os.Getenv("HOME"), ".bash_completions.d", cmdinfo.Name)
 		if runtime.GOOS == "windows" {
 			if file.IsFile(bash) {
 				t.Errorf("generate %s, however shell completion file is not generated on Windows", bash)

diff --git a/internal/completion/completion.go b/internal/completion/completion.go
@@ -41,40 +41,27 @@ func makeBashCompletionFileIfNeeded(cmd *cobra.Command) {
 		return
 	}
 
-	if !file.IsFile(path) {
-		fp, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0664)
-		if err != nil {
-			print.Err(fmt.Errorf("can not open .bash_completion: %w", err))
-			return
-		}
-
-		if _, err := fp.WriteString(bashCompletion.String()); err != nil {
-			print.Err(fmt.Errorf("can not write .bash_completion %w", err))
-			return
-		}
-
-		if err := fp.Close(); err != nil {
-			print.Err(fmt.Errorf("can not close .bash_completion %w", err))
+	if !file.IsDir(path) {
+		if err := os.MkdirAll(filepath.Dir(path), 0775); err != nil {
+			print.Err(fmt.Errorf("can not create bash-completion file: %w", err))
 			return
 		}
-		return
 	}
-
-	fp, err := os.OpenFile(path, os.O_RDWR|os.O_APPEND, 0664)
+	fp, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0664)
 	if err != nil {
 		print.Err(fmt.Errorf("can not open .bash_completion: %w", err))
 		return
 	}
 
 	if _, err := fp.WriteString(bashCompletion.String()); err != nil {
-		print.Err(fmt.Errorf("can not append .bash_completion: %w", err))
+		print.Err(fmt.Errorf("can not write .bash_completion %w", err))
 		return
 	}
 
 	if err := fp.Close(); err != nil {
-		print.Err(fmt.Errorf("can not close .bash_completion: %w", err))
-		return
+		print.Err(fmt.Errorf("can not close .bash_completion %w", err))
 	}
+	return
 }
 
 func makeFishCompletionFileIfNeeded(cmd *cobra.Command) {
@@ -235,7 +222,7 @@ func isSameZshCompletionFile(cmd *cobra.Command) bool {
 
 // bashCompletionFilePath return bash-completion file path.
 func bashCompletionFilePath() string {
-	return filepath.Join(os.Getenv("HOME"), ".bash_completion")
+	return filepath.Join(os.Getenv("HOME"), ".bash_completions.d", cmdinfo.Name)
 }
 
 // fishCompletionFilePath return fish-completion file path.