Skip to content
This repository has been archived by the owner on Apr 24, 2020. It is now read-only.

Fixes issue #619 #636

Merged
merged 2 commits into from
Oct 7, 2017
Merged

Fixes issue #619 #636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f996d2d
Fixes issue #619
goddessfreya Sep 29, 2017
ec47f1b
These probably have similar bugs
goddessfreya Sep 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions powerlevel9k.zsh-theme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ prompt_context() {

local content=""

if [[ "$POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
if [[ "$POWERLEVEL9K_ALWAYS_SHOW_CONTEXT" == true ]] || [[ "$(whoami)" != "$DEFAULT_USER" ]] || [[ -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then

if [[ $(print -P "%#") == '#' ]]; then
current_state="ROOT"
Expand All @@ -579,7 +579,7 @@ prompt_context() {
content="${POWERLEVEL9K_CONTEXT_TEMPLATE}"

elif [[ "$POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]]; then
content="$USER"
content="$(whoami)"
else
return
fi
Expand All @@ -594,7 +594,7 @@ set_default POWERLEVEL9K_USER_TEMPLATE "%n"
prompt_user() {
local current_state="DEFAULT"
typeset -AH user_state
if [[ "$POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]] || [[ "$USER" != "$DEFAULT_USER" ]]; then
if [[ "$POWERLEVEL9K_ALWAYS_SHOW_USER" == true ]] || [[ "$(whoami)" != "$DEFAULT_USER" ]]; then
if [[ $(print -P "%#") == '#' ]]; then
user_state=(
"STATE" "ROOT"
Expand All @@ -606,7 +606,7 @@ prompt_user() {
else
user_state=(
"STATE" "DEFAULT"
"CONTENT" "$USER"
"CONTENT" "$(whoami)"
"BACKGROUND_COLOR" "${DEFAULT_COLOR}"
"FOREGROUND_COLOR" "011"
"VISUAL_IDENTIFIER" "USER_ICON"
Expand Down