From 0c2c7e2f86afce16e9dbfe48d32b85ceb661a9f0 Mon Sep 17 00:00:00 2001
From: mingmingrr <mingmingrr@gmail.com>
Date: Fri, 30 Jul 2021 02:07:20 -0400
Subject: [PATCH 1/3] Use new fish variables in binding

---
 powerline/bindings/fish/powerline-setup.fish | 22 ++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/powerline/bindings/fish/powerline-setup.fish b/powerline/bindings/fish/powerline-setup.fish
index f5d02d6c..7fa15995 100644
--- a/powerline/bindings/fish/powerline-setup.fish
+++ b/powerline/bindings/fish/powerline-setup.fish
@@ -31,11 +31,19 @@ function powerline-setup
 		end
 		function _powerline_update --on-variable POWERLINE_COMMAND
 			set -l addargs "--last-exit-code=\$status"
-			set -l addargs "$addargs --last-pipe-status=\$status"
+			if test -z "$pipestatus"
+				set addargs "$addargs --last-pipe-status=\$status"
+			else
+				set addargs "$addargs --last-pipe-status=\"\$pipestatus\""
+			end
 			set -l addargs "$addargs --jobnum=(jobs -p | wc -l)"
-			# One random value has an 1/32767 = 0.0031% probability of having
-			# the same value in two shells
-			set -l addargs "$addargs --renderer-arg=client_id="(random)
+			if test -z "$fish_pid"
+				# One random value has an 1/32767 = 0.0031% probability of having
+				# the same value in two shells
+				set addargs "$addargs --renderer-arg=client_id="(random)
+			else
+				set addargs "$addargs --renderer-arg=client_id=\$fish_pid"
+			end
 			set -l addargs "$addargs --width=\$_POWERLINE_COLUMNS"
 			set -l addargs "$addargs --renderer-arg=mode=\$fish_bind_mode"
 			set -l addargs "$addargs --renderer-arg=default_mode=\$_POWERLINE_DEFAULT_MODE"
@@ -59,8 +67,8 @@ function powerline-setup
 				env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell right $addargs
 				$rpromptpast
 			end
-            function fish_mode_prompt
-            end
+			function fish_mode_prompt
+			end
 			function _powerline_set_columns --on-signal WINCH
 				set -g _POWERLINE_COLUMNS $columnsexpr
 			end
@@ -96,5 +104,7 @@ function powerline-setup
 			end
 		end
 	end
+
+	return 0
 end
 # vim: ft=fish

From f1242d192a0dce9fe94e69b5977ab51f54f56122 Mon Sep 17 00:00:00 2001
From: mingmingrr <12855406+mingmingrr@users.noreply.github.com>
Date: Fri, 30 Jul 2021 02:46:53 -0400
Subject: [PATCH 2/3] Prefer set and eval in fish binding

---
 powerline/bindings/fish/powerline-setup.fish | 44 ++++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/powerline/bindings/fish/powerline-setup.fish b/powerline/bindings/fish/powerline-setup.fish
index 7fa15995..a3a7c6fe 100644
--- a/powerline/bindings/fish/powerline-setup.fish
+++ b/powerline/bindings/fish/powerline-setup.fish
@@ -10,7 +10,7 @@ function powerline-setup
 		return 0
 	end
 
-	if test -z "$POWERLINE_CONFIG_COMMAND"
+	if not set -q POWERLINE_CONFIG_COMMAND
 		if which powerline-config >/dev/null
 			set -g POWERLINE_CONFIG_COMMAND powerline-config
 		else
@@ -18,9 +18,9 @@ function powerline-setup
 		end
 	end
 
-	if env $POWERLINE_CONFIG_COMMAND shell --shell=fish uses prompt
-		if test -z "$POWERLINE_COMMAND"
-			set -g POWERLINE_COMMAND (env $POWERLINE_CONFIG_COMMAND shell command)
+	if eval $POWERLINE_CONFIG_COMMAND shell --shell=fish uses prompt
+		if not set -q POWERLINE_COMMAND
+			set -g POWERLINE_COMMAND (eval $POWERLINE_CONFIG_COMMAND shell command)
 		end
 		function _powerline_set_default_mode --on-variable fish_key_bindings
 			if test $fish_key_bindings != fish_vi_key_bindings
@@ -31,18 +31,18 @@ function powerline-setup
 		end
 		function _powerline_update --on-variable POWERLINE_COMMAND
 			set -l addargs "--last-exit-code=\$status"
-			if test -z "$pipestatus"
-				set addargs "$addargs --last-pipe-status=\$status"
-			else
+			if set -q pipestatus
 				set addargs "$addargs --last-pipe-status=\"\$pipestatus\""
+			else
+				set addargs "$addargs --last-pipe-status=\$status"
 			end
 			set -l addargs "$addargs --jobnum=(jobs -p | wc -l)"
-			if test -z "$fish_pid"
+			if set -q fish_pid
+				set addargs "$addargs --renderer-arg=client_id=\$fish_pid"
+			else
 				# One random value has an 1/32767 = 0.0031% probability of having
 				# the same value in two shells
 				set addargs "$addargs --renderer-arg=client_id="(random)
-			else
-				set addargs "$addargs --renderer-arg=client_id=\$fish_pid"
 			end
 			set -l addargs "$addargs --width=\$_POWERLINE_COLUMNS"
 			set -l addargs "$addargs --renderer-arg=mode=\$fish_bind_mode"
@@ -50,21 +50,21 @@ function powerline-setup
 			set -l promptside
 			set -l rpromptpast
 			set -l columnsexpr
-			if test -z "$POWERLINE_NO_FISH_ABOVE$POWERLINE_NO_SHELL_ABOVE"
-				set promptside aboveleft
-				set rpromptpast 'echo -n " "'
-				set columnsexpr '(math (_powerline_columns) - 1)'
-			else
+			if begin set -q POWERLINE_NO_FISH_ABOVE; or set -q POWERLINE_NO_SHELL_ABOVE; end
 				set promptside left
 				set rpromptpast
 				set columnsexpr '(_powerline_columns)'
+			else
+				set promptside aboveleft
+				set rpromptpast 'echo -n " "'
+				set columnsexpr '(math (_powerline_columns) - 1)'
 			end
 			echo "
 			function fish_prompt
-				env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell $promptside $addargs
+				eval \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell $promptside $addargs
 			end
 			function fish_right_prompt
-				env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell right $addargs
+				eval \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell right $addargs
 				$rpromptpast
 			end
 			function fish_mode_prompt
@@ -78,15 +78,15 @@ function powerline-setup
 		_powerline_set_default_mode
 		_powerline_update
 	end
-	if env $POWERLINE_CONFIG_COMMAND shell --shell=fish uses tmux
-		if test -n "$TMUX"
+	if eval $POWERLINE_CONFIG_COMMAND shell --shell=fish uses tmux
+		if set -q TMUX
 			if tmux refresh -S ^/dev/null
 				set -g _POWERLINE_TMUX "$TMUX"
 				function _powerline_tmux_pane
-					if test -z "$TMUX_PANE"
-						env TMUX="$_POWERLINE_TMUX" tmux display -p "#D" | tr -d ' %'
-					else
+					if set -q TMUX_PANE
 						echo "$TMUX_PANE" | tr -d ' %'
+					else
+						env TMUX="$_POWERLINE_TMUX" tmux display -p "#D" | tr -d ' %'
 					end
 				end
 				function _powerline_tmux_setenv

From 4f7ceaa9eefbe005636330135fcfb98d68a90093 Mon Sep 17 00:00:00 2001
From: mingmingrr <12855406+mingmingrr@users.noreply.github.com>
Date: Mon, 6 Jun 2022 13:00:19 -0400
Subject: [PATCH 3/3] Undo using eval in fish binding

`eval` breaks on pipes due to improper space handling
---
 powerline/bindings/fish/powerline-setup.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/powerline/bindings/fish/powerline-setup.fish b/powerline/bindings/fish/powerline-setup.fish
index a3a7c6fe..721ec2de 100644
--- a/powerline/bindings/fish/powerline-setup.fish
+++ b/powerline/bindings/fish/powerline-setup.fish
@@ -61,10 +61,10 @@ function powerline-setup
 			end
 			echo "
 			function fish_prompt
-				eval \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell $promptside $addargs
+				env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell $promptside $addargs
 			end
 			function fish_right_prompt
-				eval \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell right $addargs
+				env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell right $addargs
 				$rpromptpast
 			end
 			function fish_mode_prompt
@@ -78,7 +78,7 @@ function powerline-setup
 		_powerline_set_default_mode
 		_powerline_update
 	end
-	if eval $POWERLINE_CONFIG_COMMAND shell --shell=fish uses tmux
+	if env $POWERLINE_CONFIG_COMMAND shell --shell=fish uses tmux
 		if set -q TMUX
 			if tmux refresh -S ^/dev/null
 				set -g _POWERLINE_TMUX "$TMUX"