From 8c44bae797760f697df8d821f56b217acb4d4878 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 10:12:19 -0700
Subject: [PATCH 1/3] theme/barbuk: Update prefix for overrides

---
 themes/barbuk/README.md         | 15 +++++++++------
 themes/barbuk/barbuk.theme.bash | 18 +++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index cc188190..52727e04 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -20,12 +20,15 @@ You can also override the default variables if you want to use different glyphs
 ### Default theme glyphs
 
 ```bash
-SCM_GIT_CHAR_GITLAB='  '
-SCM_GIT_CHAR_BITBUCKET='  '
-SCM_GIT_CHAR_GITHUB='  '
-SCM_GIT_CHAR_DEFAULT='  '
-SCM_GIT_CHAR_ICON_BRANCH=''
-EXIT_CODE_ICON=' '
+BARBUK_GITLAB_CHAR='  '
+BARBUK_BITBUCKET_CHAR='  '
+BARBUK_GITHUB_CHAR='  '
+BARBUK_GIT_DEFAULT_CHAR='  '
+BARBUK_GIT_BRANCH_ICON=''
+BARBUK_HG_CHAR='☿ '
+BARBUK_SVN_CHAR='⑆ '
+BARBUK_NO_SCM_CHAR=''
+BARBUK_EXIT_CODE_ICON=' '
 ```
 
 ### Customize glyphs
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index 39d4995e..ec2ac7b8 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -2,17 +2,17 @@
 # shellcheck disable=2034,2154
 
 # Theme custom glyphs
-SCM_GIT_CHAR_GITLAB=${SCM_GITLAB_CHAR:='  '}
-SCM_GIT_CHAR_BITBUCKET=${SCM_GIT_CHAR_BITBUCKET:='  '}
-SCM_GIT_CHAR_GITHUB=${SCM_GIT_CHAR_GITHUB:='  '}
-SCM_GIT_CHAR_DEFAULT=${SCM_GIT_CHAR_DEFAULT:='  '}
-SCM_GIT_CHAR_ICON_BRANCH=${SCM_GIT_CHAR_ICON_BRANCH:=''}
-EXIT_CODE_ICON=${EXIT_CODE_ICON:=' '}
+SCM_GIT_CHAR_GITLAB=${BARBUK_GITLAB_CHAR:='  '}
+SCM_GIT_CHAR_BITBUCKET=${BARBUK_BITBUCKET_CHAR:='  '}
+SCM_GIT_CHAR_GITHUB=${BARBUK_GITHUB_CHAR:='  '}
+SCM_GIT_CHAR_DEFAULT=${BARBUK_GIT_DEFAULT_CHAR:='  '}
+SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
+SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
+SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
+SCM_NONE_CHAR=${BARBUK_NO_SCM_CHAR:=''}
+EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
 
 # Bash-it default glyphs customization
-SCM_HG_CHAR='☿ '
-SCM_SVN_CHAR='⑆ '
-SCM_NONE_CHAR=
 SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX="|"

From 9e443009ac7d7c2a95df2f629afb21edd835ef31 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 10:15:22 -0700
Subject: [PATCH 2/3] theme/barbuk: Update prefix for overrides

---
 themes/barbuk/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 52727e04..8cf4be76 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -36,7 +36,7 @@ BARBUK_EXIT_CODE_ICON=' '
 Define your custom glyphs before sourcing bash-it:
 
 ```bash
-SCM_GIT_CHAR_GITHUB='•'
+export BARBUK_GITHUB_CHAR='•'
 source "$BASH_IT"/bash_it.sh
 ```
 

From 6943996f0b2cdcaf972b3ec324631435fdf63fd9 Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Tue, 31 Mar 2020 10:21:02 -0700
Subject: [PATCH 3/3] Revert the NONE_CHAR override

---
 themes/barbuk/README.md         | 1 -
 themes/barbuk/barbuk.theme.bash | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/barbuk/README.md b/themes/barbuk/README.md
index 8cf4be76..4646a49a 100644
--- a/themes/barbuk/README.md
+++ b/themes/barbuk/README.md
@@ -27,7 +27,6 @@ BARBUK_GIT_DEFAULT_CHAR='  '
 BARBUK_GIT_BRANCH_ICON=''
 BARBUK_HG_CHAR='☿ '
 BARBUK_SVN_CHAR='⑆ '
-BARBUK_NO_SCM_CHAR=''
 BARBUK_EXIT_CODE_ICON=' '
 ```
 
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index ec2ac7b8..44b5237a 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -9,10 +9,10 @@ SCM_GIT_CHAR_DEFAULT=${BARBUK_GIT_DEFAULT_CHAR:='  '}
 SCM_GIT_CHAR_ICON_BRANCH=${BARBUK_GIT_BRANCH_ICON:=''}
 SCM_HG_CHAR=${BARBUK_HG_CHAR:='☿ '}
 SCM_SVN_CHAR=${BARBUK_SVN_CHAR:='⑆ '}
-SCM_NONE_CHAR=${BARBUK_NO_SCM_CHAR:=''}
 EXIT_CODE_ICON=${BARBUK_EXIT_CODE_ICON:=' '}
 
 # Bash-it default glyphs customization
+SCM_NONE_CHAR=
 SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗"
 SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
 SCM_THEME_PROMPT_PREFIX="|"