refactor: rename shell constants

jaytyrrell13 · jaytyrrell13 · commit 73ce9d03c8a6 · 2024-09-16T22:17:46.000-04:00
diff --git a/cmd/config/set/set.go b/cmd/config/set/set.go
@@ -51,7 +51,7 @@ func RunConfigSetCmd(appFs afero.Fs, args []string) error {
 	case "EditorCmd":
 		c.EditorCmd = value
 	case "Shell":
-		if value != pkg.Shell_Bash && value != pkg.Shell_Zsh && value != pkg.Shell_Fish {
+		if value != pkg.BashShell && value != pkg.ZshShell && value != pkg.FishShell {
 			return fmt.Errorf("Shell must be either Bash, Zsh, or Fish. Received: %s", value)
 		}
 
diff --git a/cmd/install/install.go b/cmd/install/install.go
@@ -58,9 +58,9 @@ func RunInstallCmd(appFs afero.Fs) error {
 
 	if shell == "" {
 		options := []huh.Option[string]{
-			huh.NewOption("Bash", pkg.Shell_Bash),
-			huh.NewOption("Zsh", pkg.Shell_Zsh),
-			huh.NewOption("Fish", pkg.Shell_Fish),
+			huh.NewOption("Bash", pkg.BashShell),
+			huh.NewOption("Zsh", pkg.ZshShell),
+			huh.NewOption("Fish", pkg.FishShell),
 		}
 		shellString, shellErr := ui.Select("What shell do you use?", options)
 
diff --git a/cmd/make/make.go b/cmd/make/make.go
@@ -93,11 +93,11 @@ func sourceAliasFile(appFs afero.Fs, config pkg.Config) error {
 	}
 
 	switch config.Shell {
-	case pkg.Shell_Bash:
+	case pkg.BashShell:
 		return sourceBashFile(appFs, home)
-	case pkg.Shell_Zsh:
+	case pkg.ZshShell:
 		return sourceZshFile(appFs, home)
-	case pkg.Shell_Fish:
+	case pkg.FishShell:
 		return sourceFishFile(appFs, home)
 	}
 
diff --git a/pkg/constants.go b/pkg/constants.go
@@ -1,7 +1,7 @@
 package pkg
 
 const (
-	Shell_Bash = "Bash"
-	Shell_Zsh  = "Zsh"
-	Shell_Fish = "Fish"
+	BashShell = "Bash"
+	ZshShell  = "Zsh"
+	FishShell = "Fish"
 )

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func RunConfigSetCmd(appFs afero.Fs, args []string) error {`
`51`	`51`	`case "EditorCmd":`
`52`	`52`	`c.EditorCmd = value`
`53`	`53`	`case "Shell":`
`54`		`- if value != pkg.Shell_Bash && value != pkg.Shell_Zsh && value != pkg.Shell_Fish {`
	`54`	`+ if value != pkg.BashShell && value != pkg.ZshShell && value != pkg.FishShell {`
`55`	`55`	`return fmt.Errorf("Shell must be either Bash, Zsh, or Fish. Received: %s", value)`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,11 @@ func sourceAliasFile(appFs afero.Fs, config pkg.Config) error {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`switch config.Shell {`
`96`		`- case pkg.Shell_Bash:`
	`96`	`+ case pkg.BashShell:`
`97`	`97`	`return sourceBashFile(appFs, home)`
`98`		`- case pkg.Shell_Zsh:`
	`98`	`+ case pkg.ZshShell:`
`99`	`99`	`return sourceZshFile(appFs, home)`
`100`		`- case pkg.Shell_Fish:`
	`100`	`+ case pkg.FishShell:`
`101`	`101`	`return sourceFishFile(appFs, home)`
`102`	`102`	`}`
`103`	`103`