Address some comments.

Bash-it · Nov 29, 2020 · c13850f · c13850f
1 parent 8ce9d8d
commit c13850f
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/themes/gitline/gitline.theme.bash b/themes/gitline/gitline.theme.bash
@@ -65,7 +65,7 @@ IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=125
-IN_TOOLBOX_THEME_PROMPT_TEXT=" "
+IN_TOOLBOX_THEME_PROMPT_TEXT="⬢ "
 
 
 safe_append_prompt_command __powerline_prompt_command
diff --git a/themes/gitline/powerline.base.bash b/themes/gitline/powerline.base.bash
@@ -176,7 +176,7 @@ function __powerline_aws_profile_prompt {
 function __powerline_in_toolbox_prompt {
   local fg_color=206
 
-  if [[ -e /run/.toolboxenv ]]; then
+  if [ -f /run/.containerenv ] && [ -f /run/.toolboxenv ]; then
     echo "${IN_TOOLBOX_THEME_PROMPT_TEXT}|${IN_TOOLBOX_THEME_PROMPT_COLOR}|${fg_color}"
   fi
 }

diff --git a/themes/powerline-multiline/README.md b/themes/powerline-multiline/README.md
@@ -59,7 +59,7 @@ The contents of both prompt sides can be "reordered", all the "segments" (every
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command

diff --git a/themes/powerline-multiline/powerline-multiline.theme.bash b/themes/powerline-multiline/powerline-multiline.theme.bash
@@ -75,7 +75,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 

diff --git a/themes/powerline-naked/README.md b/themes/powerline-naked/README.md
@@ -52,7 +52,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command

diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
@@ -70,7 +70,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=254}
 

diff --git a/themes/powerline-plain/README.md b/themes/powerline-plain/README.md
@@ -50,7 +50,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command

diff --git a/themes/powerline-plain/powerline-plain.theme.bash b/themes/powerline-plain/powerline-plain.theme.bash
@@ -67,7 +67,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="Ⓣ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 

diff --git a/themes/powerline/README.md b/themes/powerline/README.md
@@ -58,7 +58,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * `clock` - Current time in `HH:MM:SS` format
 * `cwd` - Current working directory including full folder hierarchy (c.f. `wd`)
 * `hostname` - Host name of machine
-* `in_toolbox` - Show identifier if running inside a toolbox
+* `in_toolbox` - Show identifier if running inside a [toolbox](https://github.com/containers/toolbox)
 * `in_vim` - Show identifier if running in `:terminal` from vim
 * `k8s_context` - Show current kubernetes context
 * `last_status` - Exit status of last run command

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
@@ -170,7 +170,7 @@ function __powerline_aws_profile_prompt() {
 }
 
 function __powerline_in_toolbox_prompt() {
-	if [[ -e /run/.toolboxenv ]]; then
+	if [ -f /run/.containerenv ] && [ -f /run/.toolboxenv ]; then
 		echo "${IN_TOOLBOX_THEME_PROMPT_TEXT}|${IN_TOOLBOX_THEME_PROMPT_COLOR}"
 	fi
 }

diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
@@ -72,7 +72,7 @@ IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=${POWERLINE_IN_TOOLBOX_COLOR:=125}
-IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="❲T❳ "}
+IN_TOOLBOX_THEME_PROMPT_TEXT=${POWERLINE_IN_TOOLBOX_TEXT:="⬢ "}
 
 HOST_THEME_PROMPT_COLOR=${POWERLINE_HOST_COLOR:=0}
 

diff --git a/themes/redline/redline.theme.bash b/themes/redline/redline.theme.bash
@@ -56,7 +56,7 @@ IN_VIM_THEME_PROMPT_COLOR=245
 IN_VIM_THEME_PROMPT_TEXT="vim"
 
 IN_TOOLBOX_THEME_PROMPT_COLOR=125
-IN_TOOLBOX_THEME_PROMPT_TEXT=" "
+IN_TOOLBOX_THEME_PROMPT_TEXT="⬢ "
 
 POWERLINE_PROMPT=${POWERLINE_PROMPT:="python_venv ruby user_info hostname cwd scm"}