From 0ebe0f96862fa64a116d2dd9e063fdd77f8b261e Mon Sep 17 00:00:00 2001 From: Chris Baker Date: Thu, 14 Mar 2019 14:29:39 -0400 Subject: [PATCH 1/4] fixes rbenv.p9k fails if specified local ruby version is not present Signed-off-by: Chris Baker --- segments/rbenv/rbenv.p9k | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/segments/rbenv/rbenv.p9k b/segments/rbenv/rbenv.p9k index 31ef8dba5..af83f465e 100644 --- a/segments/rbenv/rbenv.p9k +++ b/segments/rbenv/rbenv.p9k @@ -32,7 +32,7 @@ prompt_rbenv() { if [[ -n "${RBENV_VERSION}" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${RBENV_VERSION}" elif [ ${commands[rbenv]} ]; then - local rbenv_version_name="$(rbenv version-name)" + local rbenv_version_name="$(rbenv version-name 2>/dev/null || echo "($(rbenv local 2>/dev/null))")" local rbenv_global="$(rbenv global)" if [[ "${rbenv_version_name}" != "${rbenv_global}" || "${P9K_RBENV_PROMPT_ALWAYS_SHOW}" == "true" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${rbenv_version_name}" From 215961543c1dded4ab10324139868189425e4147 Mon Sep 17 00:00:00 2001 From: Chris Baker Date: Sun, 17 Mar 2019 00:41:05 -0400 Subject: [PATCH 2/4] rbenv.p9k uses STATUS_ERROR for missing ruby ver Signed-off-by: Chris Baker --- segments/rbenv/rbenv.p9k | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/segments/rbenv/rbenv.p9k b/segments/rbenv/rbenv.p9k index af83f465e..235a2b116 100644 --- a/segments/rbenv/rbenv.p9k +++ b/segments/rbenv/rbenv.p9k @@ -32,7 +32,7 @@ prompt_rbenv() { if [[ -n "${RBENV_VERSION}" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${RBENV_VERSION}" elif [ ${commands[rbenv]} ]; then - local rbenv_version_name="$(rbenv version-name 2>/dev/null || echo "($(rbenv local 2>/dev/null))")" + local rbenv_version_name="$(rbenv version-name 2>/dev/null || echo "$(p9k::print_icon STATUS_ERROR) $(rbenv local 2>/dev/null)")" local rbenv_global="$(rbenv global)" if [[ "${rbenv_version_name}" != "${rbenv_global}" || "${P9K_RBENV_PROMPT_ALWAYS_SHOW}" == "true" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${rbenv_version_name}" From cccef79e6b39340800caae7891f5f30f23c24e19 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Wed, 3 Apr 2019 03:14:39 +0200 Subject: [PATCH 3/4] Remove a subshell from rbenv segment --- segments/rbenv/rbenv.p9k | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/segments/rbenv/rbenv.p9k b/segments/rbenv/rbenv.p9k index 235a2b116..2562f7f58 100644 --- a/segments/rbenv/rbenv.p9k +++ b/segments/rbenv/rbenv.p9k @@ -32,7 +32,7 @@ prompt_rbenv() { if [[ -n "${RBENV_VERSION}" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${RBENV_VERSION}" elif [ ${commands[rbenv]} ]; then - local rbenv_version_name="$(rbenv version-name 2>/dev/null || echo "$(p9k::print_icon STATUS_ERROR) $(rbenv local 2>/dev/null)")" + local rbenv_version_name="$(rbenv version-name 2>/dev/null || echo -n "${__P9K_ICONS[STATUS_ERROR]}" && rbenv local 2>/dev/null)" local rbenv_global="$(rbenv global)" if [[ "${rbenv_version_name}" != "${rbenv_global}" || "${P9K_RBENV_PROMPT_ALWAYS_SHOW}" == "true" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${rbenv_version_name}" From 1946bc6f519834f533fa249bb95dc62a49a11ac5 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Wed, 3 Apr 2019 03:21:47 +0200 Subject: [PATCH 4/4] Use own error icon in rbenv segment --- segments/rbenv/rbenv.p9k | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/segments/rbenv/rbenv.p9k b/segments/rbenv/rbenv.p9k index 2562f7f58..ade120aea 100644 --- a/segments/rbenv/rbenv.p9k +++ b/segments/rbenv/rbenv.p9k @@ -14,6 +14,9 @@ #     p9k::register_segment "RBENV" "" "red" "${DEFAULT_COLOR}" '' $'\uE847 ' $'\uF219 ' '\u'$CODEPOINT_OF_OCTICONS_RUBY' ' $'\uF219 ' + # ✘ ✘ ✘   + p9k::register_icon "RBENV_ERROR" $'\u2718' $'\u2718' $'\u2718' '\u'${CODEPOINT_OF_AWESOME_TIMES} $'\uF00D' + ################################################################ # Register segment default values p9k::set_default P9K_RBENV_ALWAYS false @@ -32,7 +35,7 @@ prompt_rbenv() { if [[ -n "${RBENV_VERSION}" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${RBENV_VERSION}" elif [ ${commands[rbenv]} ]; then - local rbenv_version_name="$(rbenv version-name 2>/dev/null || echo -n "${__P9K_ICONS[STATUS_ERROR]}" && rbenv local 2>/dev/null)" + local rbenv_version_name="$(rbenv version-name 2>/dev/null || echo -n "${__P9K_ICONS[RBENV_ERROR]}" && rbenv local 2>/dev/null)" local rbenv_global="$(rbenv global)" if [[ "${rbenv_version_name}" != "${rbenv_global}" || "${P9K_RBENV_PROMPT_ALWAYS_SHOW}" == "true" ]]; then p9k::prepare_segment "$0" "" $1 "$2" $3 "${rbenv_version_name}"