From 9e57afb623372f87312b2b44e7fcf205f9ec32b1 Mon Sep 17 00:00:00 2001 From: Thomas Cherry Date: Tue, 23 Jul 2019 21:37:15 -0400 Subject: [PATCH 1/2] #468 - adding a check for env and providing a default if it does not exist --- powerline_shell/segments/env.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/powerline_shell/segments/env.py b/powerline_shell/segments/env.py index 29ef048a..732ce165 100644 --- a/powerline_shell/segments/env.py +++ b/powerline_shell/segments/env.py @@ -4,7 +4,11 @@ class Segment(BasicSegment): def add_to_powerline(self): - self.powerline.append( - " %s " % os.getenv(self.segment_def["var"]), - self.segment_def.get("fg_color", self.powerline.theme.PATH_FG), - self.segment_def.get("bg_color", self.powerline.theme.PATH_BG)) + env = os.getenv(self.segment_def["var"]) + if env is None: + env = self.segment_def["default"] + if env is not None: + self.powerline.append( + " %s " % env, + self.segment_def.get("fg_color", self.powerline.theme.PATH_FG), + self.segment_def.get("bg_color", self.powerline.theme.PATH_BG)) From 30479f0b65afdf18fae814280451c54f0a432192 Mon Sep 17 00:00:00 2001 From: Thomas Cherry Date: Tue, 23 Jul 2019 22:00:56 -0400 Subject: [PATCH 2/2] #468 - forgot to check for existance first --- powerline_shell/segments/env.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerline_shell/segments/env.py b/powerline_shell/segments/env.py index 732ce165..6954578c 100644 --- a/powerline_shell/segments/env.py +++ b/powerline_shell/segments/env.py @@ -5,7 +5,7 @@ class Segment(BasicSegment): def add_to_powerline(self): env = os.getenv(self.segment_def["var"]) - if env is None: + if env is None and "default" in self.segment_def: env = self.segment_def["default"] if env is not None: self.powerline.append(