slitaz-forge rev 621
pkgs: support full form of maintainer's e-mail address (dedicated to Lucas Levrel:)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Jun 03 13:18:39 2016 +0300 (2016-06-03) |
parents | e1fafc0186cf |
children | 5f16c8476fe4 |
files | pkgs/search.sh |
line diff
1.1 --- a/pkgs/search.sh Thu Jun 02 03:45:35 2016 +0300 1.2 +++ b/pkgs/search.sh Fri Jun 03 13:18:39 2016 +0300 1.3 @@ -1100,12 +1100,17 @@ 1.4 <td>$(echo "$SHORT_DESC" | htmlize)</td> 1.5 </tr> 1.6 EOT 1.7 - [ -n "$MAINTAINER" ] && cat <<EOT 1.8 + if [ -n "$MAINTAINER" ]; then 1.9 + # For form "John Doe <jdoe@example.org>" 1.10 + M="${MAINTAINER#*<}"; M="${M%>}" # extract address "jdoe@example.org" 1.11 + MAINTAINER=$(echo $MAINTAINER | htmlize) # escape "<" and ">" for use in HTML 1.12 + cat <<EOT 1.13 <tr> 1.14 <td class="first"><b>$(gettext 'Maintainer')</b></td> 1.15 - <td><a href="?maintainer=$MAINTAINER$addver">${MAINTAINER/@/​@​}</a></td> 1.16 + <td><a href="?maintainer=$M$addver">${MAINTAINER/@/​@​}</a></td> 1.17 </tr> 1.18 EOT 1.19 + fi 1.20 [ -n "$LICENSE" ] && cat <<EOT 1.21 <tr> 1.22 <td class="first"><b>$(gettext 'License')</b></td> 1.23 @@ -1546,7 +1551,11 @@ 1.24 grep -l ^MAINTAINER= $WOK/*/receipt | while read file; do 1.25 MAINTAINER= 1.26 . $file 1.27 - echo $MAINTAINER 1.28 + case $MAINTAINER in 1.29 + # For form "John Doe <jdoe@example.org> 1.30 + *\<*) MAINTAINER="${MAINTAINER#*<}"; echo "${MAINTAINER%>}";; 1.31 + *) echo $MAINTAINER;; 1.32 + esac 1.33 done | display_cloud maintainer 1.34 fi 1.35 ;;