wish.sh

@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC1090
 
 # 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]}"
+	for i in ${WISH_RPL[@]}; do
+		echo "\e[$(($COLUMNS - $i + 1))G${WISH_RIGHT_PS1[$idx]}"
 		((idx++))
 	done
 }
@@ -23,14 +22,10 @@ function wish_init() {
 	# Source config files
 	for path in "$XDG_CONFIG_HOME" "/usr/share" "$HOME/.config"; do
 		if [[ -f "$path/wish/wish.py" ]]; then
-			source <($path/wish/wish.py "${WISH_CONFIG_FILE[@]}")
+			source <($path/wish/wish.py ${WISH_CONFIG_FILE[@]})
 			break
 		fi
 	done
-
-	# Set defaults for core if not found
-	: "${WISH_POWERLINE_LEFT:=}"
-	: "${WISH_POWERLINE_RIGHT=}"
 	# Source all plugins
 	# If WISH_CONFIG_FILE is not set, then assume that the user hasn't updated
 	# to a config file yet. Set WISH_PLUGINS_SOURCE=WISH_PLUGINS.
@@ -39,12 +34,11 @@ function wish_init() {
 	fi
 	local plugin
 	local path
-	for plugin in "${WISH_PLUGINS_SOURCE[@]}"; do
-		if ! for path in "$XDG_CONFIG_HOME" "/usr/share" "$HOME/.config"; do
+	for plugin in ${WISH_PLUGINS_SOURCE[@]}; do
+		for path in "$XDG_CONFIG_HOME" "/usr/share" "$HOME/.config"; do
 			source "$path/wish/plugins/$plugin.sh" &> /dev/null && break
-		done; then
-			echo "Plugin $plugin not found." >&2
-		fi
+		done
+		[[ $? -ne 0 ]] && echo "Plugin $plugin not found." >&2
 	done
 
 	# Source theme
@@ -66,8 +60,8 @@ function wish_init() {
 	done
 
 	# Call plugins to set colors
-	for plugin in "${WISH_PLUGINS[@]}" "${WISH_RIGHT_PLUGINS[@]}"; do
-		eval wish_${plugin}_set_colors $prev
+	for plugin in ${WISH_PLUGINS[@]} ${WISH_RIGHT_PLUGINS[@]}; do
+		eval wish_$(echo $plugin)_set_colors $prev
 	done
 }
 
@@ -192,7 +186,7 @@ function wish_main() {
 	WISH_LPLINE=0
 	local i
 	# Set newline
-	if [[ $WISH_AUTO_NEWLINE != 0 ]]; then
+	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"
@@ -210,12 +204,12 @@ function wish_main() {
 						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} "${WISH_POWERLINE_LEFT}"
+						wish_append ${!bg_name} ${!fg_name} 
 					fi
 				else
 					local plugin=${WISH_PLUGINS[$i]}
 					local fg_name="WISH_${plugin^^}_BG"
-					wish_append -1 ${!fg_name} "${WISH_POWERLINE_LEFT}"
+					wish_append -1 ${!fg_name} 
 				fi
 			fi
 		fi
@@ -228,13 +222,13 @@ function wish_main() {
 				if [[ $i == 0 ]]; then
 					local plugin=${WISH_RIGHT_PLUGINS[$i]}
 					local fg_name="WISH_${plugin^^}_BG"
-					wish_append -1 ${!fg_name} "${WISH_POWERLINE_RIGHT}"
+					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} "${WISH_POWERLINE_RIGHT}"
+					wish_append ${!bg_name} ${!fg_name} 
 				fi
 			fi
 		fi