From ae9da3b62bd2f6d2c1fa8baf858070d05fe9fd70 Mon Sep 17 00:00:00 2001
From: BarbUk <BarbUk@users.noreply.github.com>
Date: Thu, 7 Jan 2021 18:05:00 +0100
Subject: [PATCH] Clean barbuk theme (#1766)

---
 clean_files.txt                 |  1 +
 themes/barbuk/barbuk.theme.bash | 92 ++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index 6325d8a7..ab3841ac 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -27,6 +27,7 @@ lint_clean_files.sh
 #
 themes/90210
 themes/powerline
+themes/barbuk
 
 # plugins
 #
diff --git a/themes/barbuk/barbuk.theme.bash b/themes/barbuk/barbuk.theme.bash
index ce4c3016..c7229997 100644
--- a/themes/barbuk/barbuk.theme.bash
+++ b/themes/barbuk/barbuk.theme.bash
@@ -41,71 +41,71 @@ SCM_THEME_CURRENT_USER_PREFFIX='  '
 SCM_GIT_SHOW_CURRENT_USER=false
 
 function _git-uptream-remote-logo {
-    [[ "$(_git-upstream)" == "" ]] && SCM_GIT_CHAR="$SCM_GIT_CHAR_DEFAULT"
+	[[ "$(_git-upstream)" == "" ]] && SCM_GIT_CHAR="$SCM_GIT_CHAR_DEFAULT"
 
-    local remote remote_domain
-    remote=$(_git-upstream-remote)
-    remote_domain=$(git config --get remote."$remote".url | awk -F'[@:.]' '{print $2}')
+	local remote remote_domain
+	remote=$(_git-upstream-remote)
+	remote_domain=$(git config --get remote."$remote".url | awk -F'[@:.]' '{print $2}')
 
-    # remove // suffix for https:// url
-    remote_domain=${remote_domain//\//}
+	# remove // suffix for https:// url
+	remote_domain=${remote_domain//\//}
 
-    case $remote_domain in
-        github ) SCM_GIT_CHAR="$SCM_GIT_CHAR_GITHUB";;
-        gitlab ) SCM_GIT_CHAR="$SCM_GIT_CHAR_GITLAB";;
-        bitbucket ) SCM_GIT_CHAR="$SCM_GIT_CHAR_BITBUCKET";;
-        * ) SCM_GIT_CHAR="$SCM_GIT_CHAR_DEFAULT";;
-    esac
+	case $remote_domain in
+		github) SCM_GIT_CHAR="$SCM_GIT_CHAR_GITHUB" ;;
+		gitlab) SCM_GIT_CHAR="$SCM_GIT_CHAR_GITLAB" ;;
+		bitbucket) SCM_GIT_CHAR="$SCM_GIT_CHAR_BITBUCKET" ;;
+		*) SCM_GIT_CHAR="$SCM_GIT_CHAR_DEFAULT" ;;
+	esac
 }
 
 function git_prompt_info {
-    git_prompt_vars
-    echo -e " on $SCM_GIT_CHAR_ICON_BRANCH $SCM_PREFIX$SCM_BRANCH$SCM_STATE$SCM_GIT_AHEAD$SCM_GIT_BEHIND$SCM_GIT_STASH$SCM_SUFFIX"
+	git_prompt_vars
+	echo -e " on $SCM_GIT_CHAR_ICON_BRANCH $SCM_PREFIX$SCM_BRANCH$SCM_STATE$SCM_GIT_AHEAD$SCM_GIT_BEHIND$SCM_GIT_STASH$SCM_SUFFIX"
 }
 
 function _exit-code {
-    if [[ "$1" -ne 0 ]]; then
-        exit_code=" ${purple}${EXIT_CODE_ICON}${yellow}${exit_code}${bold_orange}"
-    else
-        exit_code="${bold_green}"
-    fi
+	if [[ "$1" -ne 0 ]]; then
+		exit_code=" ${purple}${EXIT_CODE_ICON}${yellow}${exit_code}${bold_orange}"
+	else
+		exit_code="${bold_green}"
+	fi
 }
 
 function _prompt {
-    local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' python_venv='' host command_duration=
+	local exit_code="$?" wrap_char=' ' dir_color=$green ssh_info='' python_venv='' host command_duration=
 
-    command_duration=$(_command_duration)
+	command_duration=$(_command_duration)
 
-    _exit-code exit_code
-    _git-uptream-remote-logo
+	_exit-code exit_code
+	_git-uptream-remote-logo
 
-    history -a
+	history -a
 
-    # Detect root shell
-    if [ "$(whoami)" = root ]; then
-        dir_color=$red
-    fi
+	# Detect root shell
+	if [ "$(whoami)" = root ]; then
+		dir_color=$red
+	fi
 
-    # Detect ssh
-    if [[ -n "${SSH_CONNECTION}" ]] && [ "$SSH_INFO" = true ]; then
-        if [ "$HOST_INFO" = long ]; then
-            host="\H"
-        else
-            host="\h"
-        fi
-        ssh_info="${bold_blue}\u${bold_orange}@${cyan}$host ${bold_orange}in"
-    fi
+	# Detect ssh
+	if [[ -n "${SSH_CONNECTION}" ]] && [ "$SSH_INFO" = true ]; then
+		if [ "$HOST_INFO" = long ]; then
+			host="\H"
+		else
+			host="\h"
+		fi
+		ssh_info="${bold_blue}\u${bold_orange}@${cyan}$host ${bold_orange}in"
+	fi
 
-    # Detect python venv
-    if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-        python_venv="$PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV} "
-    elif [[ -n "${VIRTUAL_ENV}" ]]; then
-        python_venv="$PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}") "
-    fi
+	# Detect python venv
+	if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+		python_venv="$PYTHON_VENV_CHAR${CONDA_DEFAULT_ENV} "
+	elif [[ -n "${VIRTUAL_ENV}" ]]; then
+		python_venv="$PYTHON_VENV_CHAR$(basename "${VIRTUAL_ENV}") "
+	fi
 
-    PS1="\\n${ssh_info} ${purple}$(scm_char)${python_venv}${dir_color}\\w${normal}$(scm_prompt_info)${command_duration}${exit_code}"
-    [[ ${#PS1} -gt $((COLUMNS*2)) ]] && wrap_char="\\n"
-    PS1="${PS1}${wrap_char}❯${normal} "
+	PS1="\\n${ssh_info} ${purple}$(scm_char)${python_venv}${dir_color}\\w${normal}$(scm_prompt_info)${command_duration}${exit_code}"
+	[[ ${#PS1} -gt $((COLUMNS * 2)) ]] && wrap_char="\\n"
+	PS1="${PS1}${wrap_char}❯${normal} "
 }
 
 safe_append_prompt_command _prompt