fixup

completion/all.go

@@ -27,18 +27,18 @@ const (
 	ShellPowershell string = "powershell"
 )
 
-func ShellByName(shell, programName string) Shell {
+func ShellByName(shell, programName string) (Shell, error) {
 	switch shell {
 	case ShellBash:
-		return Bash(runtime.GOOS, programName)
+		return Bash(runtime.GOOS, programName), nil
 	case ShellFish:
-		return Fish(runtime.GOOS, programName)
+		return Fish(runtime.GOOS, programName), nil
 	case ShellZsh:
-		return Zsh(runtime.GOOS, programName)
+		return Zsh(runtime.GOOS, programName), nil
 	case ShellPowershell:
-		return Powershell(runtime.GOOS, programName)
+		return Powershell(runtime.GOOS, programName), nil
 	default:
-		return nil
+		return nil, fmt.Errorf("unsupported shell %q", shell)
 	}
 }
 
@@ -49,7 +49,7 @@ func ShellOptions(choice *string) *serpent.Enum {
 func DetectUserShell(programName string) (Shell, error) {
 	// Attempt to get the SHELL environment variable first
 	if shell := os.Getenv("SHELL"); shell != "" {
-		return ShellByName(filepath.Base(shell), ""), nil
+		return ShellByName(filepath.Base(shell), "")
 	}
 
 	// Fallback: Look up the current user and parse /etc/passwd
@@ -69,7 +69,7 @@ func DetectUserShell(programName string) (Shell, error) {
 		if strings.HasPrefix(line, currentUser.Username+":") {
 			parts := strings.Split(line, ":")
 			if len(parts) > 6 {
-				return ShellByName(filepath.Base(parts[6]), programName), nil // The shell is typically the 7th field
+				return ShellByName(filepath.Base(parts[6]), programName) // The shell is typically the 7th field
 			}
 		}
 	}