Merge pull request #1970 from asahasrabuddhe/backport-issue-1884

[Backport] Fix: Use $0 env var to correctly retrieve the current active shell
urfave · Aug 22, 2024 · bcc6869 · bcc6869
2 parents 9114559 + e3ff573
commit bcc6869
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app_test.go b/app_test.go
@@ -369,7 +369,7 @@ func ExampleApp_Run_bashComplete() {
 func ExampleApp_Run_zshComplete() {
 	// set args for examples sake
 	os.Args = []string{"greet", "--generate-bash-completion"}
-	_ = os.Setenv("SHELL", "/usr/bin/zsh")
+	_ = os.Setenv("0", "/usr/bin/zsh")
 
 	app := NewApp()
 	app.Name = "greet"

diff --git a/help.go b/help.go
@@ -150,7 +150,7 @@ func printCommandSuggestions(commands []*Command, writer io.Writer) {
 		if command.Hidden {
 			continue
 		}
-		if strings.HasSuffix(os.Getenv("SHELL"), "zsh") {
+		if strings.HasSuffix(os.Getenv("0"), "zsh") {
 			for _, name := range command.Names() {
 				_, _ = fmt.Fprintf(writer, "%s:%s\n", name, command.Usage)
 			}