Merge pull request #2048 from gaelicWizard/theme/liquidprompt

Author: seefood

.gitignore

@@ -22,3 +22,5 @@ tmp/
 profiles/*
 # apart from the default one
 !profiles/default.bash_it
+
+/vendor/github.com/nojhan/liquidprompt

clean_files.txt

@@ -65,6 +65,7 @@ themes/githelpers.theme.bash
 themes/gitline
 themes/inretio
 themes/lambda
+themes/liquidprompt
 themes/modern
 themes/norbu
 themes/oh-my-posh

themes/liquidprompt/liquidprompt.theme.bash

@@ -1,86 +1,95 @@
-#!/usr/bin/env bash
-# Wrapper to use liquidprompt with bashit
+# shellcheck shell=bash
+# shellcheck disable=SC2034 # expected behavior for themes
+# Wrapper to use liquidprompt with _Bash It_
 
-targetdir="$BASH_IT/themes/liquidprompt/liquidprompt"
 gray="\[\e[1;90m\]"
 
-cwd="$PWD"
-if cd "$targetdir" &> /dev/null && git rev-parse --is-inside-work-tree &> /dev/null; then
-	true
-else
-	git clone https://github.com/nojhan/liquidprompt.git "$targetdir" \
-		&& echo -e "Successfully cloned liquidprompt!\n More configuration in '$targetdir/liquid.theme'."
+## Download repository if needed
+__bash_it_theme_liquidprompt_path="github.com/nojhan/liquidprompt"
+__bash_it_theme_liquidprompt_dir="${BASH_IT?}/vendor/${__bash_it_theme_liquidprompt_path}"
+if [[ ! -d "${__bash_it_theme_liquidprompt_dir}" ]]; then
+	if git clone --branch stable "https://${__bash_it_theme_liquidprompt_path}" "${__bash_it_theme_liquidprompt_dir}"; then
+		__bash_it_theme_liquidprompt_lqprc="${XDG_CONFIG_HOME:-"$HOME/.config"}/liquidpromptrc"
+		__bash_it_theme_liquidprompt_tilde='~'
+		if [[ ! -e "${__bash_it_theme_liquidprompt_lqprc}" ]]; then
+			# shellcheck disable=SC2016 disable=SC1003
+			sed -e 's/^LP_/#LP_/g' -e 's;#LOCAL_RCFILE=$HOME/.liquidpromptrc.local;LOCAL_RCFILE=${BASH_SOURCE[0]}.local;g' -e 's/#\[ -f "$LOCAL_RCFILE" \] && source "$LOCAL_RCFILE"/if [[ -s $LOCAL_RCFILE ]]; then\'$'\n\t''source "$LOCAL_RCFILE"\'$'\n''fi/g' < "${__bash_it_theme_liquidprompt_dir}/liquidpromptrc-dist" > "${__bash_it_theme_liquidprompt_lqprc}"
+		fi
+		echo -e "Successfully cloned liquidprompt!\n More configuration in '${__bash_it_theme_liquidprompt_lqprc//$HOME/$__bash_it_theme_liquidprompt_tilde}' (or '${__bash_it_theme_liquidprompt_lqprc//$HOME/$__bash_it_theme_liquidprompt_tilde}.local')."
+	fi
 fi
-cd "$cwd"
-
-export LP_ENABLE_TIME=1
-export LP_HOSTNAME_ALWAYS=1
-export LP_USER_ALWAYS=1
-export LP_MARK_LOAD="📈 "
-export LP_BATTERY_THRESHOLD=${LP_BATTERY_THRESHOLD:-75}
-export LP_LOAD_THRESHOLD=${LP_LOAD_THRESHOLD:-60}
-export LP_TEMP_THRESHOLD=${LP_TEMP_THRESHOLD:-80}
-
-unset _lp_legacy _lp_escape __lp_escape
-source "$targetdir/liquidprompt"
-prompt() { true; }
-export PS2=" ┃ "
-export LP_PS1_PREFIX="┌─"
-export LP_PS1_POSTFIX="\n└▪ "
-export LP_ENABLE_RUNTIME=0
 
-_lp_legacy() {
-	type -t _lp_escape &> /dev/null
-}
+## Configure theme
+LP_MARK_LOAD="📈 "
+: "${LP_ENABLE_TIME:=1}"
+: "${LP_HOSTNAME_ALWAYS:=1}"
+: "${LP_USER_ALWAYS:=1}"
+: "${LP_BATTERY_THRESHOLD:=75}"
+: "${LP_LOAD_THRESHOLD:=60}"
+: "${LP_TEMP_THRESHOLD:=80}"
 
-_lp_legacy && __lp_escape() {
-	ret="$(_lp_escape "$@")"
-}
+## Load theme, but don't activate
+# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/nojhan/liquidprompt
+source "${__bash_it_theme_liquidprompt_dir}/liquidprompt" --no-activate
 
-_lp_git_branch() {
-	((LP_ENABLE_GIT)) || return
+## Activate theme, without clobbering `bash-preexec`
+LP_OLD_PS1="${PROMPT:-${PS1:-\$ }}"
+LP_OLD_PROMPT_COMMAND=""
+function prompt_on() { :; }
+function prompt_off() { :; }
+function prompt_OFF() { :; }
+# shellcheck disable=SC2119
+TERM_PROGRAM=not_apple_terminal LP_ENABLE_RUNTIME=0 LP_ENABLE_RUNTIME_BELL=0 lp_activate
+safe_append_preexec '__lp_runtime_before'
+safe_append_prompt_command '__lp_set_prompt'
 
-	\git rev-parse --is-inside-work-tree > /dev/null 2>&1 || return
+## Override upstream defaults
+PS2=" ┃ "
+LP_PS1_PREFIX="┌─"
+LP_PS1_POSTFIX="\n└▪ "
+LP_ENABLE_RUNTIME=0
 
-	local commit branch ret
+function _lp_git_branch() {
+	((${LP_ENABLE_GIT:-0})) || return
 
-	commit="$(\git rev-parse --short -q HEAD 2> /dev/null)"
+	command git rev-parse --is-inside-work-tree > /dev/null 2>&1 || return
 
+	local branch
 	# Recent versions of Git support the --short option for symbolic-ref, but
 	# not 1.7.9 (Ubuntu 12.04)
-	if branch="$(\git symbolic-ref -q HEAD)"; then
-		__lp_escape "$commit:${branch#refs/heads/}"
-		lp_vcs_branch="$ret"
+	if branch="$(command git symbolic-ref -q HEAD)"; then
+		_lp_escape "$(command git rev-parse --short=5 -q HEAD 2> /dev/null):${branch#refs/heads/}"
 	else
 		# In detached head state, use commit instead
 		# No escape needed
-		lp_vcs_branch="$commit"
+		command git rev-parse --short -q HEAD 2> /dev/null
 	fi
-	_lp_legacy && echo $lp_vcs_branch || return 0
 }
 
-_lp_time() {
-	if ((LP_ENABLE_TIME)) && ((!LP_TIME_ANALOG)); then
-		LP_TIME="${gray}$(date +%d-%H:%M)${normal}"
+function _lp_time() {
+	if ((LP_ENABLE_TIME)) && ((!${LP_TIME_ANALOG:-0})); then
+		LP_TIME="${gray?}\D{${THEME_CLOCK_FORMAT:-"%d-%H:%M"}}${normal?}"
 	else
 		LP_TIME=""
 	fi
 }
 
 # Implementation using lm-sensors
-_lp_temp_sensors() {
+function _lp_temp_sensors() {
 	local -i i
 	for i in $(sensors -u \
 		| sed -n 's/^  temp[0-9][0-9]*_input: \([0-9]*\)\..*$/\1/p'); do
-		(($i > ${temperature:-0})) && (($i != 127)) && temperature=i
+		((i > ${temperature:-0})) && ((i != 127)) && temperature=i
 	done
 }
 
 # Implementation using 'acpi -t'
-_lp_temp_acpi() {
+function _lp_temp_acpi() {
 	local -i i
 	for i in $(LANG=C acpi -t \
 		| sed 's/.* \(-\?[0-9]*\)\.[0-9]* degrees C$/\1/p'); do
-		(($i > ${temperature:-0})) && (($i != 127)) && temperature=i
+		((i > ${temperature:-0})) && ((i != 127)) && temperature=i
 	done
 }
+
+unset "${!__bash_it_theme_liquidprompt_@}"