init: refactor script collection concatenation

commands/inits/data/git_wrapper.fish

@@ -1,6 +1,5 @@
 # Based on https://github.com/arbelt/fish-plugin-scmpuff,
 # with scmpuff-exec support (https://github.com/mroth/scmpuff/pull/49)
-
 functions -e git
 
 set -q SCMPUFF_GIT_CMD; or set -x SCMPUFF_GIT_CMD (which git)

commands/inits/init.go

@@ -3,20 +3,19 @@ package inits
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/spf13/cobra"
 )
 
-// Since the flags are defined and used in different locations, we need to
-// define a variable outside with the correct scope to assign the flag to work
-// with.
-var includeAliases bool
-var legacyShow bool
-var wrapGit bool
-var shellType string
-
 // CommandInit generates the command handler for `scmpuff init`
 func CommandInit() *cobra.Command {
+	var (
+		shellType      string
+		includeAliases bool
+		wrapGit        bool
+		legacyShow     bool
+	)
 
 	var InitCmd = &cobra.Command{
 		Use:   "init",
@@ -39,13 +38,18 @@ There are a number of flags to customize the shell integration.
 			if legacyShow {
 				shellType = defaultShellType()
 			}
-			switch shellType {
+
+			switch strings.ToLower(shellType) {
 			case "":
 				cmd.Help()
 				os.Exit(0)
 
-			case "sh", "bash", "zsh", "fish":
-				printScript()
+			case "sh", "bash", "zsh":
+				fmt.Println(bashCollection.Output(wrapGit, includeAliases))
+				os.Exit(0)
+
+			case "fish":
+				fmt.Println(fishCollection.Output(wrapGit, includeAliases))
 				os.Exit(0)
 
 			default:

commands/inits/scripts.go

@@ -2,7 +2,7 @@ package inits
 
 import (
 	_ "embed"
-	"fmt"
+	"strings"
 )
 
 //go:embed data/status_shortcuts.sh
@@ -20,22 +20,34 @@ var scriptGitWrapper string
 //go:embed data/git_wrapper.fish
 var scriptGitWrapperFish string
 
-func printScript() {
-	if shellType == "fish" {
-		fmt.Println(scriptStatusShortcutsFish)
-	} else {
-		fmt.Println(scriptStatusShortcuts)
-	}
+type scriptCollection struct {
+	statusShortcuts string
+	gitWrapper      string
+	aliases         string
+}
 
-	if includeAliases {
-		fmt.Println(scriptAliases)
-	}
+var bashCollection = scriptCollection{
+	statusShortcuts: scriptStatusShortcuts,
+	gitWrapper:      scriptGitWrapper,
+	aliases:         scriptAliases,
+}
 
+var fishCollection = scriptCollection{
+	statusShortcuts: scriptStatusShortcutsFish,
+	gitWrapper:      scriptGitWrapperFish,
+	aliases:         scriptAliases,
+}
+
+func (sc scriptCollection) Output(wrapGit, aliases bool) string {
+	var b strings.Builder
+	b.WriteString(sc.statusShortcuts)
 	if wrapGit {
-		if shellType == "fish" {
-			fmt.Println(scriptGitWrapperFish)
-		} else {
-			fmt.Println(scriptGitWrapper)
-		}
+		b.WriteRune('\n')
+		b.WriteString(sc.gitWrapper)
+	}
+	if aliases {
+		b.WriteRune('\n')
+		b.WriteString(sc.aliases)
 	}
+	return b.String()
 }