From f966248f16d81416c72fc96412e4a66aa7fbdf0d Mon Sep 17 00:00:00 2001
From: Aaron Gyes <me@aaron.gy>
Date: Sat, 2 Jul 2016 11:40:22 -0700
Subject: [PATCH] string.fish: use if/else. Reindent.

---
 share/functions/string.fish | 45 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/share/functions/string.fish b/share/functions/string.fish
index e8b961bf9..799258217 100644
--- a/share/functions/string.fish
+++ b/share/functions/string.fish
@@ -1,25 +1,26 @@
 # XXX nostring
 if not contains string (builtin -n)
-	function string
-		if not set -q __is_launched_without_string
-			if status --is-interactive
-				# We've been autoloaded after fish < 2.3.0 upgraded to >= 2.3.1 - no string builtin
-				set_color --bold >&2
-				echo "Fish has been upgraded, and the scripts on your system are not compatible" >&2
-				echo "with this prior instance of fish. You can probably run:" >&2
-				set_color green >&2
-				echo -e "\n exec fish" >&2
-				set_color normal >&2
-				echo "… to replace this process with a new one in-place." >&2
-				set -g __is_launched_without_string 1
-			end
-	    end
-	    # We hope that in $__fish_bin_path is a newer fish that can do `string` for us.
-	    
-	    set PATH $__fish_bin_dir $PATH
-	    set string_cmd string \'$argv\'
-	   	fish -c 'contains string (builtin -n)'
-	   	and fish -c "$string_cmd"
-	   	or return 127
-	end                                                               
+    function string
+        if not set -q __is_launched_without_string
+            if status --is-interactive
+                # We've been autoloaded after fish < 2.3.0 upgraded to >= 2.3.1 - no string builtin
+                set_color --bold >&2
+                echo "Fish has been upgraded, and the scripts on your system are not compatible" >&2
+                echo "with this prior instance of fish. You can probably run:" >&2
+                set_color green >&2
+                echo -e "\n exec fish" >&2
+                set_color normal >&2
+                echo "… to replace this process with a new one in-place." >&2
+                set -g __is_launched_without_string 1
+            end
+        end
+        set PATH $__fish_bin_dir $PATH
+        set string_cmd string \'$argv\'
+
+        if fish -c 'contains string (builtin -n)'
+            fish -c "$string_cmd"
+        else
+            return 127
+        end
+    end
 end