# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1464949119 -10800
# Node ID 8c57ef6cb7b0921139160879317ac60591d6ae16
# Parent  e1fafc0186cfa05fe2c82ea9d1dcdbf814fd6b6b
pkgs: support full form of maintainer's e-mail address (dedicated to Lucas Levrel:)

diff -r e1fafc0186cf -r 8c57ef6cb7b0 pkgs/search.sh
--- a/pkgs/search.sh	Thu Jun 02 03:45:35 2016 +0300
+++ b/pkgs/search.sh	Fri Jun 03 13:18:39 2016 +0300
@@ -1100,12 +1100,17 @@
 		<td>$(echo "$SHORT_DESC" | htmlize)</td>
 	</tr>
 EOT
-		[ -n "$MAINTAINER" ] && cat <<EOT
+		if [ -n "$MAINTAINER" ]; then
+			# For form "John Doe <jdoe@example.org>"
+			M="${MAINTAINER#*<}"; M="${M%>}" # extract address "jdoe@example.org"
+			MAINTAINER=$(echo $MAINTAINER | htmlize) # escape "<" and ">" for use in HTML
+			cat <<EOT
 	<tr>
 		<td class="first"><b>$(gettext 'Maintainer')</b></td>
-		<td><a href="?maintainer=$MAINTAINER$addver">${MAINTAINER/@/&#8203;@&#8203;}</a></td>
+		<td><a href="?maintainer=$M$addver">${MAINTAINER/@/&#8203;@&#8203;}</a></td>
 	</tr>
 EOT
+		fi
 		[ -n "$LICENSE" ] && cat <<EOT
 	<tr>
 		<td class="first"><b>$(gettext 'License')</b></td>
@@ -1546,7 +1551,11 @@
 		grep -l ^MAINTAINER= $WOK/*/receipt | while read file; do
 			MAINTAINER=
 			. $file
-			echo $MAINTAINER
+			case $MAINTAINER in
+				# For form "John Doe <jdoe@example.org>
+				*\<*) MAINTAINER="${MAINTAINER#*<}"; echo "${MAINTAINER%>}";;
+				*) echo $MAINTAINER;;
+			esac
 			done | display_cloud maintainer
 	fi
 	;;