summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hilburn <bhilburn@gmail.com>2016-10-27 17:57:12 +0300
committerGitHub <noreply@github.com>2016-10-27 17:57:12 +0300
commitb54abe48dc080a595224f91f123245ca3e28ba9f (patch)
tree2ea997ecabdf9fbf002abd3e229361744551e8d6
parent11fcb5684b3b777ebfeb01edc4b985951c8f04a6 (diff)
parentb129cd09e00202a7f3c1d43e3e60a9e2da1e076c (diff)
Merge pull request #332 from eviltak/show-ok-in-non-verbose-status
Show OK in non verbose status prompt
-rw-r--r--README.md3
-rwxr-xr-xpowerlevel9k.zsh-theme12
2 files changed, 7 insertions, 8 deletions
diff --git a/README.md b/README.md
index 2d031706..8cdf7be2 100644
--- a/README.md
+++ b/README.md
@@ -317,7 +317,8 @@ This segment shows the return code of the last command.
| Variable | Default Value | Description |
|----------|---------------|-------------|
-|`POWERLEVEL9K_STATUS_VERBOSE`|`true`|Set to false if you wish to hide this segment when the last command completed successfully.|
+|`POWERLEVEL9K_STATUS_VERBOSE`|`true`|Set to false if you wish to not show the error code when the last command returned an error and optionally hide this segment when the last command completed successfully by setting `POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE` to false.|
+|`POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE`|`false`|Set to true if you wish to show this segment when the last command completed successfully in non-verbose mode.|
##### ram
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 87678149..7e68af2b 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -748,17 +748,16 @@ prompt_rvm() {
# Status: return code if verbose, otherwise just an icon if an error occurred
set_default POWERLEVEL9K_STATUS_VERBOSE true
+set_default POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE false
prompt_status() {
- if [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true ]]; then
- if [[ "$RETVAL" -ne 0 ]]; then
+ if [[ "$RETVAL" -ne 0 ]]; then
+ if [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true ]]; then
"$1_prompt_segment" "$0_ERROR" "$2" "red" "226" "$RETVAL" 'CARRIAGE_RETURN_ICON'
else
- "$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "046" "" 'OK_ICON'
- fi
- else
- if [[ "$RETVAL" -ne 0 ]]; then
"$1_prompt_segment" "$0_ERROR" "$2" "$DEFAULT_COLOR" "red" "" 'FAIL_ICON'
fi
+ elif [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true || "$POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE" == true ]]; then
+ "$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "046" "" 'OK_ICON'
fi
}
@@ -1091,4 +1090,3 @@ powerlevel9k_init() {
}
powerlevel9k_init "$@"
-