refactor: cache shell name

JanDeDobbeleer · Dec 27, 2020 · b427a0e · b427a0e
1 parent 85ee0bb
commit b427a0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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,