Replace escape codes with tput

install.sh

@@ -1,16 +1,10 @@
 #!/usr/bin/env bash
 
-if hash git; then
-	git clone https://gitlab.com/ceda_ei/wish.git $HOME/.config/wish.git
-else
-	curl https://gitlab.com/ceda_ei/wish/-/archive/master/wish-master.tar -o /tmp/wish.tar
-	mkdir $HOME/.config 2> /dev/null
-	cd /tmp/
-	tar xf wish.tar
-	mv wish-master/ wish/
-	mv wish/ $HOME/.config/
-fi
-
+curl https://gitlab.com/ceda_ei/wish/-/archive/master/wish-master.tar -o /tmp/wish.tar
+cd /tmp/
+tar xf wish.tar
+mv wish-master/ wish/
+mv wish/ $HOME/.config/
 cat >> ~/.bashrc <<EOF
 
 # Wish
@@ -19,3 +13,4 @@ WISH_PLUGINS=(exit_code_smiley bg_jobs date path newline vcs)
 WISH_THEME=plain
 source ~/.config/wish/wish.sh
 EOF
+

plugins/battery.sh

@@ -16,17 +16,12 @@ function wish_battery_set_colors() {
 
 function wish_battery_main() {
 	local path=/sys/class/power_supply/$WISH_BATTERY_ID
-	local battery
-	if [[ -f $path/charge_now ]]; then
-		battery=$(($(cat $path/charge_now) * 100 / $(cat $path/charge_full)))%
-		if [[ $(cat $path/status) == "Charging" ]] ||
-			[[ $(cat $path/status) == "Full" ]]; then
-			battery="$WISH_BATTERY_CHARGING $battery"
-		else
-			battery="$WISH_BATTERY_DISCHARGING $battery"
-		fi
+	local battery=$(($(cat $path/charge_now) * 100 / $(cat $path/charge_full)))%
+	if [[ $(cat $path/status) == "Charging" ]] ||
+		[[ $(cat $path/status) == "Full" ]]; then
+		battery="$WISH_BATTERY_CHARGING $battery"
 	else
-		battery="$WISH_BATTERY_ID not found"
+		battery="$WISH_BATTERY_DISCHARGING $battery"
 	fi
 	wish_append $WISH_BATTERY_BG $WISH_BATTERY_FG " $battery "
 }

plugins/exit_code_smiley.sh

@@ -11,14 +11,11 @@ function wish_exit_code_smiley_set_colors() {
 	WISH_EXIT_CODE_SMILEY_BG=${WISH_EXIT_CODE_SMILEY_BG:-$WISH_DEFAULT_BG}
 	WISH_EXIT_CODE_SMILEY_PASS=${WISH_EXIT_CODE_SMILEY_PASS:- :) }
 	WISH_EXIT_CODE_SMILEY_FAIL=${WISH_EXIT_CODE_SMILEY_FAIL:- :( }
-	WISH_EXIT_CODE_SMILEY_HIDE_ON_PASS=${WISH_EXIT_CODE_SMILEY_HIDE_ON_PASS:-0}
 }
 
 function wish_exit_code_smiley_main() {
 	if [[ $1 == 0 ]]; then
-		if [[ $WISH_EXIT_CODE_SMILEY_HIDE_ON_PASS == 0 ]]; then
-			wish_append $WISH_EXIT_CODE_SMILEY_BG $WISH_EXIT_CODE_SMILEY_FG "$WISH_EXIT_CODE_SMILEY_PASS"
-		fi
+		wish_append $WISH_EXIT_CODE_SMILEY_BG $WISH_EXIT_CODE_SMILEY_FG "$WISH_EXIT_CODE_SMILEY_PASS"
 	else
 		wish_append $WISH_EXIT_CODE_SMILEY_BG $WISH_EXIT_CODE_SMILEY_FG "$WISH_EXIT_CODE_SMILEY_FAIL"
 	fi

plugins/path_powerline.sh

@@ -1,59 +0,0 @@
-function wish_path_powerline_start() {
-	return 0
-}
-
-function wish_path_powerline_end() {
-	return 0
-}
-
-function wish_path_powerline_set_colors() {
-	WISH_PATH_POWERLINE_FG=${WISH_PATH_POWERLINE_FG:-$WISH_DEFAULT_FG}
-	WISH_PATH_POWERLINE_BG=${WISH_PATH_POWERLINE_BG:-$WISH_DEFAULT_BG}
-	WISH_PATH_POWERLINE_NO_WRITE_SUFFIX=${WISH_PATH_POWERLINE_NO_WRITE_SUFFIX:- }
-	WISH_PATH_POWERLINE_MAX_PERC=${WISH_PATH_POWERLINE_MAX_PERC:-0}
-}
-
-function wish_path_lensum() {
-	sum=0
-	for i in $*; do
-		sum=$(($sum + ${#i}))
-	done
-	echo $sum
-}
-
-function wish_path_powerline_shrink() {
-	local IFS='/'
-	local path=( $1 )
-	local max=$2
-	for ((i=0; i <$((${#path[@]} - 1)); i++)); do
-		path[$i]=${path[$i]:0:1}
-		if [[ $(wish_path_lensum ${path[@]}) -lt $max ]]; then
-			local short_path=""
-			for i in ${path[@]}; do
-				short_path+="$i/"
-			done
-			echo "${short_path%/}"
-			return
-		fi
-	done
-	local short_path=""
-	for i in ${path[@]}; do
-		short_path+="$i/"
-	done
-	echo "${short_path%/}"
-}
-
-function wish_path_powerline_main() {
-	local path="${PWD/#$HOME/\~}"
-	if [[ $WISH_PATH_POWERLINE_MAX_PERC -ne 0 && ${#path} -ge $WISH_PATH_POWERLINE_MAX_LEN ]] ; then
-		local max=$(($WISH_PATH_POWERLINE_MAX_PERC * $(wish_remaining_chars) / 100))
-		local path=$(wish_path_powerline_shrink "$path" "$max")
-	fi
-	local path="${path//\//  }"
-	if [[ -w $PWD ]]; then
-		local path=" $path "
-	else
-		local path=" $path$WISH_PATH_POWERLINE_NO_WRITE_SUFFIX "
-	fi
-	wish_append $WISH_PATH_POWERLINE_BG $WISH_PATH_POWERLINE_FG "$path"
-}

plugins/vcs.sh

@@ -15,7 +15,7 @@ function wish_vcs_set_colors() {
 }
 
 function wish_vcs_main() {
-	local op=$(git diff --numstat 2> /dev/null || echo -1)
+	local op=$(git diff --numstat HEAD 2> /dev/null || echo -1)
 	if [[ $op != "-1" ]]; then
 		local git
 		git="$git $WISH_VCS_GIT_SYMBOL "

themes/gradient.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-local i
-local gradient=(226 118 37 66 60 237 233)
-local fg_gradient=(16 16 16 16 16 15 15)
-local j=0
-for i in ${WISH_PLUGINS[@]}; do
-	[[ $i =~ newline$ ]] && j=0 && continue
-	eval WISH_${i^^}_BG=${gradient[$j]}
-	eval WISH_${i^^}_FG=${fg_gradient[$j]}
-	((j++))
-	if [[ $j -eq ${#gradient[@]} ]]; then
-		j=0
-	fi
-done
-
-j=0
-for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do
-	i=${WISH_RIGHT_PLUGINS[$idx]}
-	[[ $i =~ newline$ ]] && j=0 && continue
-	eval WISH_${i^^}_BG=${gradient[$j]}
-	eval WISH_${i^^}_FG=${fg_gradient[$j]}
-	((j++))
-	if [[ $j -eq ${#gradient[@]} ]]; then
-		j=0
-	fi
-done

themes/lowfi-neon.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-WISH_POWERLINE=0
-local i
-local gradient=(e7c547 c0e551 82e35a 62e177 6bdfb3 73d4dd 7aa6da)
-local j=0
-for i in ${WISH_PLUGINS[@]}; do
-	[[ $i =~ newline$ ]] && j=0 && continue
-	eval WISH_${i^^}_BG=-1
-	eval WISH_${i^^}_FG=${gradient[$j]}
-	((j++))
-	if [[ $j -eq ${#gradient[@]} ]]; then
-		j=0
-	fi
-done
-
-j=0
-for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do
-	i=${WISH_RIGHT_PLUGINS[$idx]}
-	[[ $i =~ newline$ ]] && j=0 && continue
-	eval WISH_${i^^}_BG=-1
-	eval WISH_${i^^}_FG=${gradient[$j]}
-	((j++))
-	if [[ $j -eq ${#gradient[@]} ]]; then
-		j=0
-	fi
-done

themes/plain.sh

@@ -1,7 +1,7 @@
 WISH_DEFAULT_BG=-1
 WISH_DEFAULT_FG=-1
 WISH_POWERLINE=0
-for i in ${WISH_PLUGINS[@]} ${WISH_RIGHT_PLUGINS[@]}; do
-	eval WISH_${i^^}_BG=-1
-	eval WISH_${i^^}_FG=-1
+for i in ${WISH_PLUGINS[@]}; do
+	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_BG=-1
+	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_FG=-1
 done

themes/rgb_gradient.sh

@@ -3,23 +3,12 @@
 local i
 local gradient=(ffff5f 7ad767 66b097 5e7388 534d61 3a3338 121212)
 local fg_gradient=(000000 000000 000000 000000 000000 ffffff ffffff)
+# local gradient=(888888 999999)
 local j=0
 for i in ${WISH_PLUGINS[@]}; do
-	[[ $i =~ newline$ ]] && j=0 && continue
-	eval WISH_${i^^}_BG=${gradient[$j]}
-	eval WISH_${i^^}_FG=${fg_gradient[$j]}
-	((j++))
-	if [[ $j -eq ${#gradient[@]} ]]; then
-		j=0
-	fi
-done
-
-j=0
-for ((idx=$((${#WISH_RIGHT_PLUGINS[@]} - 1)); idx >= 0; idx--)); do
-	i=${WISH_RIGHT_PLUGINS[$idx]}
-	[[ $i =~ newline$ ]] && j=0 && continue
-	eval WISH_${i^^}_BG=${gradient[$j]}
-	eval WISH_${i^^}_FG=${fg_gradient[$j]}
+	[[ $i == "newline" ]] && j=0 && continue
+	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_BG=${gradient[$j]}
+	eval WISH_$(echo $i | tr '[:lower:]' '[:upper:]')_FG=${fg_gradient[$j]}
 	((j++))
 	if [[ $j -eq ${#gradient[@]} ]]; then
 		j=0

wish.sh

@@ -1,178 +1,74 @@
 #!/usr/bin/env bash
 
-# INTERNAL USE ONLY! Do not use this in plugins.
-function wish_print_right_prompt() {
-	local idx=0
-	for i in ${WISH_RPL[@]}; do
-		echo "\e[$(($COLUMNS - $i + 1))G${WISH_RIGHT_PS1[$idx]}"
-		((idx++))
-	done
-}
-
 function wish_init() {
 	# Source all plugins
-	local plugin
-	local path
-	for plugin in ${WISH_PLUGINS[@]} ${WISH_RIGHT_PLUGINS[@]}; do
-		for path in "$XDG_CONFIG_HOME" "/usr/share" "$HOME/.config"; do
-			source "$path/wish/plugins/$plugin.sh" &> /dev/null && break
+	local i
+	local j
+	for i in ${WISH_PLUGINS[@]}; do
+		for j in "$XDG_CONFIG_HOME" "/usr/share" "$HOME/.config"; do
+			source "$j/wish/plugins/$i.sh" &> /dev/null && break
 		done
 		[[ $? -ne 0 ]] && echo "Plugin $i not found." >&2
 	done
 
 	# Source theme
 	WISH_THEME=${WISH_THEME:-plain}
-	while :; do
-		for theme in "$XDG_CONFIG_HOME" "/usr/share" "$HOME/.config"; do
-			source "$theme/wish/themes/$WISH_THEME.sh" &> /dev/null && break
-		done
-		if [[ $? -eq 0 ]]; then
-			break
-		else
-			echo "Theme $WISH_THEME not found. Using theme plain." >&2
-			if [[ $WISH_THEME == "plain" ]]; then
-				break
-			else
-				WISH_THEME=plain
-			fi
-		fi
+	for i in "$XDG_CONFIG_HOME" "/usr/share" "$HOME/.config"; do
+		source "$i/wish/themes/$WISH_THEME.sh" &> /dev/null && break
 	done
 
+	[[ $? -ne 0 ]] && echo "Theme $WISH_THEME not found." >&2
+
 	# Call plugins to set colors
-	for plugin in ${WISH_PLUGINS[@]} ${WISH_RIGHT_PLUGINS[@]}; do
-		eval wish_$(echo $plugin)_set_colors $prev
+	for i in ${WISH_PLUGINS[@]}; do
+		eval wish_$(echo $i)_set_colors $prev
 	done
 }
 
-# Usage: color_to_escape_code [3|4] color
-#
-# Parameters:
-# - [3|4]: Use 3 if escape code is for foreground, 4 for background
-# - color: -1 to reset, 0-255 for terminal color codes. 6 digit hexadecimal
-# value for true color.
-#
-# Return value: Prints escape code that sets the fg/bg as requested.
-function color_to_escape_code() {
-	local choice=$1
-	local color=$2
-	if [[ $color == -1 ]]; then
-		echo "\[\033[0;5;0m\]"
-	else
-		if [[ ${#fg_code} -eq 6 ]]; then
-			local r=$(( 16#${color:0:2} ))
-			local g=$(( 16#${color:2:2} ))
-			local b=$(( 16#${color:4:2} ))
-			echo "\[\033[${choice}8;2;$r;$g;${b}m\]"
-		else
-			echo "\[\033[${choice}8;5;${fg_code}m\]"
-		fi
-	fi
-}
-# INTERNAL USE ONLY! Do not use this in plugins.
-# Usage: wish_append_left escape_codes text
-function wish_append_left() {
-	local text="$2"
-	local colors="$1"
-	local prompt_text="${text@P}"
-	if [[ $text == "\n" ]]; then
-		((WISH_LPLINE++))
-		WISH_LPL=(${WISH_LPL[@]} 0)
-		WISH_LEFT_PS1="$WISH_LEFT_PS1$colors$text"
-	else
-		if [[ $((${WISH_LPL[$WISH_LPLINE]} + ${#prompt_text})) -lt $COLUMNS ]]; then
-			WISH_LEFT_PS1="$WISH_LEFT_PS1$colors$text"
-			WISH_LPL[$WISH_LPLINE]=$((${WISH_LPL[$WISH_LPLINE]} + ${#prompt_text}))
-		fi
-	fi
-}
-
-# INTERNAL USE ONLY! Do not use this in plugins.
-# Usage: wish_append_right escape_codes text
-function wish_append_right() {
-	local text="$2"
-	local colors="$1"
-	local prompt_text="${text@P}"
-	if [[ $text == "\n" ]]; then
-		((WISH_RPLINE++))
-		WISH_RIGHT_PS1=("${WISH_RIGHT_PS1[@]}" "")
-		WISH_RPL=(${WISH_RPL[@]} 0)
-	elif [[ $((${WISH_LPL[$WISH_RPLINE]} + ${WISH_RPL[$WISH_RPLINE]} + ${#prompt_text})) -lt $COLUMNS ]]; then
-		WISH_RIGHT_PS1[$WISH_RPLINE]="${WISH_RIGHT_PS1[$WISH_RPLINE]}$colors$text"
-		WISH_RPL[$WISH_RPLINE]=$((${WISH_RPL[$WISH_RPLINE]} + ${#prompt_text}))
-	fi
-}
-
-# Public API
 # Usage: wish_append bg fg text
-#
-# Parameters:
-# - fg, bg: -1 to reset, 0-255 for terminal color codes. 6 digit hexadecimal
-# value for true color.
-# - text: Text of the plugin
-#
-# Return value: None
 function wish_append() {
 	local bg_code=$1
 	local fg_code=$2
 	local text=$3
-	local fg=$(color_to_escape_code 3 $fg_code)
-	local bg=$(color_to_escape_code 4 $bg_code)
+	if [[ $fg_code == -1 ]]; then
+		local fg=$(tput sgr0)
+	else
+		if [[ ${#fg_code} -eq 6 ]]; then
+			local color=($(echo $fg_code | grep -o .))
+			local r=$(( 16#${color[0]}${color[1]} ))
+			local g=$(( 16#${color[2]}${color[3]} ))
+			local b=$(( 16#${color[4]}${color[5]} ))
+			local fg="\[\033[38;2;$r;$g;${b}m\]"
+		else
+			local fg=$(tput setaf $fg_code)
+		fi
+	fi
+	if [[ $bg_code == -1 ]]; then
+		local bg=$(tput sgr0)
+	else
+		if [[ ${#bg_code} -eq 6 ]]; then
+			local color=($(echo $bg_code | grep -o .))
+			local r=$(( 16#${color[0]}${color[1]} ))
+			local g=$(( 16#${color[2]}${color[3]} ))
+			local b=$(( 16#${color[4]}${color[5]} ))
+			local bg="\[\033[48;2;$r;$g;${b}m\]"
+		else
+			local bg=$(tput setab $bg_code)
+		fi
+	fi
 
 	if [[ $fg_code == -1 ]]; then
-		case $WISH_STATE in
-			0)
-				wish_append_left "$fg$bg" "$text"
-				;;
-			1)
-				wish_append_right "$fg$bg" "$text"
-				;;
-		esac
+		PS1="$PS1$fg${bg}$text"
 	else
-		case $WISH_STATE in
-			0)
-				wish_append_left "$bg$fg" "$text"
-				;;
-			1)
-				wish_append_right "$bg$fg" "$text"
-				;;
-		esac
+		PS1="$PS1$bg${fg}$text"
 	fi
 }
 
-# Public API
-# Usage: wish_remaining_chars
-# Parameters: None
-# Return Value: Capture stdout to get the remaining characters available in the
-# line.
-wish_remaining_chars() {
-	if [[ $WISH_STATE -eq 0 ]]; then
-		echo "$(( $COLUMNS - ${WISH_LPL[$WISH_LPLINE]} ))"
-	else
-		echo "$(( $COLUMNS - ${WISH_LPL[$WISH_RPLINE]} - ${WISH_RPL[$WISH_RPLINE]} ))"
-	fi
-}
 
 function wish_main() {
 	local prev=$?
-	# Set local IFS to avoid being affected by shell's IFS
-	local IFS=$' \n'
 	PS1=""
-	WISH_LEFT_PS1=""
-	WISH_RIGHT_PS1=("")
-	WISH_LPL=(0)
-	WISH_RPL=(0)
-	WISH_RPLINE=0
-	WISH_LPLINE=0
 	local i
-	# Set newline
-	if [[ $WISH_AUTONEWLINE != 0 ]]; then
-		echo -ne "\033[6n" ; read -s -d ';'; read -s -d R WISH_CURSOR_POSITION
-		if [[ $WISH_CURSOR_POSITION != "1" ]]; then
-			PS1="\n"
-		fi
-	fi
-	# Generate left prompt.
-	WISH_STATE=0  # 0 = left prompt, 1 = right prompt
 	for i in $(seq 0 $((${#WISH_PLUGINS[@]} - 1))); do
 		wish_${WISH_PLUGINS[i]}_main $prev
 		if [[ -v WISH_POWERLINE ]] && [[ $WISH_POWERLINE != 0 ]]; then
@@ -181,43 +77,25 @@ function wish_main() {
 					if wish_${WISH_PLUGINS[$(($i + 1))]}_start $prev; then
 						local plugin=${WISH_PLUGINS[$i]}
 						local next_plugin=${WISH_PLUGINS[$(($i+1))]}
-						local fg_name="WISH_${plugin^^}_BG"
-						local bg_name="WISH_${next_plugin^^}_BG"
-						wish_append ${!bg_name} ${!fg_name} 
+						local fg=$(eval echo \$WISH_$(echo $plugin |
+							tr '[:lower:]' '[:upper:]')_BG)
+						local bg=$(eval echo \$WISH_$(echo $next_plugin |
+							tr '[:lower:]' '[:upper:]')_BG)
+						wish_append $bg $fg 
 					fi
 				else
 					local plugin=${WISH_PLUGINS[$i]}
-					local fg_name="WISH_${plugin^^}_BG"
-					wish_append -1 ${!fg_name} 
+					local fg=$(eval echo \$WISH_$(echo $plugin |
+						tr '[:lower:]' '[:upper:]')_BG)
+					wish_append -1 $fg 
 				fi
 			fi
 		fi
-	done
-	# Generate Right prompt.
-	WISH_STATE=1
-	for i in $(seq 0 $((${#WISH_RIGHT_PLUGINS[@]} - 1))); do
-		if [[ -v WISH_POWERLINE ]] && [[ $WISH_POWERLINE != 0 ]]; then
-			if wish_${WISH_RIGHT_PLUGINS[$i]}_end $prev; then
-				if [[ $i == 0 ]]; then
-					local plugin=${WISH_RIGHT_PLUGINS[$i]}
-					local fg_name="WISH_${plugin^^}_BG"
-					wish_append -1 ${!fg_name} 
-				elif wish_${WISH_RIGHT_PLUGINS[$(($i - 1))]}_start $prev; then
-					local plugin=${WISH_RIGHT_PLUGINS[$i]}
-					local prev_plugin=${WISH_RIGHT_PLUGINS[$(($i-1))]}
-					local fg_name="WISH_${plugin^^}_BG"
-					local bg_name="WISH_${prev_plugin^^}_BG"
-					wish_append ${!bg_name} ${!fg_name} 
-				fi
-			fi
+
+		if [[ $i -eq $((${#WISH_PLUGINS[@]} - 1)) ]]; then
+			PS1="$PS1\[\033[0;5;0m\]"
 		fi
-		wish_${WISH_RIGHT_PLUGINS[$i]}_main $prev
 	done
-	# Save cursor position, print right prompt, restore cursor position,
-	# print left prompt, reset terminal
-	PS1=$PS1"\[\e7"
-	PS1="$PS1$(wish_print_right_prompt)"
-	PS1="$PS1\e8\]$WISH_LEFT_PS1\[\033[0;5;0m\]"
 }
 
 wish_init