From ef67fc7ba05ab2c9b8e6b5240ce4f9da92ca79b8 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 4 Dec 2015 16:22:49 +0800
Subject: [PATCH] __fish_complete_man: rework AWK script

Adds support for the man-db alias format used in CentOS/RHEL 5
Adds basic support for the output of apropos on Solaris

Work on #2087.
---
 share/functions/__fish_complete_man.fish | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index 59c8c24eb..1bdaa5c6a 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -35,17 +35,27 @@ function __fish_complete_man
 		    print name, sect ": " $2;
 		  }
 		}
-		# Linux
-		/^[^( \t]+ \('$section'\)/ {
+		# man-db
+		/^[^( \t]+ +\('$section'\)/ {
 		  split($1, t, " ");
 		  sect = substr(t[2], 2, length(t[2]) - 2);
 		  print t[1], sect ": " $2;
 		}
-		# Solaris
-		/^[^( \t]+\t+[^\(\t]/ {
+		# man-db RHEL 5 with [aliases]
+		/^[^( \t]+ +\[.*\] +\('$section'\)/ {
 		  split($1, t, " ");
 		  sect = substr(t[3], 2, length(t[3]) - 2);
-		  print t[2], sect ": " $2;
+		  print t[1], sect ": " $2;
+		}
+		# Solaris 11
+		# Does not display descriptions
+		# Solaris apropos outputs embedded backspace in descriptions
+		/^[0-9]+\. [^( \t]*\('$section'\) / {
+		  split($1, t, " ")
+		  paren = index(t[2], "(");
+		  name = substr(t[2], 1, paren - 1);
+		  sect = substr(t[2], paren + 1, length(t[2]) - paren - 1);
+		  print name, sect
 		}
 		'
 	end