From b427a0e8a4c9909d8d6d7b8352de0168e802a32b Mon Sep 17 00:00:00 2001
From: Jan De Dobbeleer <jan.de.dobbeleer@gmail.com>
Date: Sun, 27 Dec 2020 14:59:40 +0100
Subject: [PATCH] refactor: cache shell name

---
 src/environment.go | 3 +++
 src/main.go        | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/environment.go b/src/environment.go
index 0b080b43811f..b12b346de2bc 100644
--- a/src/environment.go
+++ b/src/environment.go
@@ -217,6 +217,9 @@ func (env *environment) getBatteryInfo() (*battery.Battery, error) {
 }
 
 func (env *environment) getShellName() string {
+	if *env.args.Shell != "" {
+		return *env.args.Shell
+	}
 	pid := os.Getppid()
 	p, _ := process.NewProcess(int32(pid))
 	name, err := p.Name()
diff --git a/src/main.go b/src/main.go
index b09673349b4c..d558bd9ef9c2 100644
--- a/src/main.go
+++ b/src/main.go
@@ -127,12 +127,8 @@ func main() {
 		fmt.Println(Version)
 		return
 	}
-	shell := env.getShellName()
-	if *args.Shell != "" {
-		shell = *args.Shell
-	}
 	formats := &ansiFormats{}
-	formats.init(shell)
+	formats.init(env.getShellName())
 	renderer := &AnsiRenderer{
 		buffer:  new(bytes.Buffer),
 		formats: formats,