Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Add new maintainer field to pbi metafile

  • Loading branch information...
commit a497938818fa56243635e9aaa32b1eba1d37ad48 1 parent 42c6cfd
Kris Moore kmoore134 authored

Showing 1 changed file with 16 additions and 1 deletion. Show diff stats Hide diff stats

  1. +16 1 src-sh/pbi-manager10/pbi-manager
17 src-sh/pbi-manager10/pbi-manager
@@ -211,6 +211,7 @@ Options:
211 211 -k keywords -- Application keywords for searching
212 212 -l license -- Application license type
213 213 Example: BSD, GPL, Commercial
  214 + -m email -- Port / Application Maintainer
214 215 -n name -- Application / category name (Required)
215 216 -t type -- Application interface type
216 217 Example; Graphical, Text, Service
@@ -541,6 +542,9 @@ parse_mt_pbi_cmdline() {
541 542 case "$1" in
542 543 --cat) PBI_MT_TYPE="CAT" ;;
543 544 --app) PBI_MT_TYPE="APP" ;;
  545 + -m) if [ $# -eq 1 ]; then usage_mt_add; fi
  546 + shift; PBI_MT_MAINTAINER="$1"
  547 + ;;
544 548 -n) if [ $# -eq 1 ]; then usage_mt_add; fi
545 549 shift; PBI_MT_ADDNAME="$1"
546 550 ;;
@@ -2045,6 +2049,7 @@ do_pbi_mt_syncpbi()
2045 2049 if [ -n "$PBI_PROGAUTHOR" ] ; then mFlags="$mFlags -a \"${PBI_PROGAUTHOR}\""; fi
2046 2050 if [ -n "$PBI_CATEGORY" ] ; then mFlags="$mFlags -c \"${PBI_CATEGORY}\""; fi
2047 2051 if [ -n "$PBI_LICENSE" ] ; then mFlags="$mFlags -l \"${PBI_LICENSE}\""; fi
  2052 + if [ -n "$PBI_MAINTAINER" ] ; then mFlags="$mFlags -m \"${PBI_MAINTAINER}\""; fi
2048 2053 if [ -n "$PBI_TAGS" ] ; then mFlags="$mFlags -k \"${PBI_TAGS}\""; fi
2049 2054 if [ -n "$PBI_ICONURL" ] ; then mFlags="$mFlags -i \"${PBI_ICONURL}\""; fi
2050 2055 if [ -n "$PBI_PROGWEB" ] ; then mFlags="$mFlags -u \"${PBI_PROGWEB}\""; fi
@@ -2104,7 +2109,7 @@ do_pbi_mt_add_app() {
2104 2109 local _date=`date '+%s'`
2105 2110
2106 2111 cp ${PBI_MT_METAFILE} ${PBI_TMPDIR}/.meta.$$
2107   - echo "App=${PBI_MT_ADDNAME};${PBI_MT_ADDCAT};${PBI_MT_ADDICON};${PBI_MT_ADDAUTHOR};${PBI_MT_ADDURL};${PBI_MT_ADDLIC};${PBI_MT_ADDTYPE};${PBI_MT_ADDKEYWORDS};${PBI_MT_ADDDESC};$PBI_MT_REQUIRESROOT;${_date}" \
  2112 + echo "App=${PBI_MT_ADDNAME};${PBI_MT_ADDCAT};${PBI_MT_ADDICON};${PBI_MT_ADDAUTHOR};${PBI_MT_ADDURL};${PBI_MT_ADDLIC};${PBI_MT_ADDTYPE};${PBI_MT_ADDKEYWORDS};${PBI_MT_ADDDESC};$PBI_MT_REQUIRESROOT;${_date};${PBI_MT_MAINTAINER}" \
2108 2113 >> ${PBI_TMPDIR}/.meta.$$
2109 2114 sort ${PBI_TMPDIR}/.meta.$$ > "${PBI_MT_METAFILE}"
2110 2115 rm ${PBI_TMPDIR}/.meta.$$
@@ -3093,6 +3098,7 @@ load_info_from_dir() {
3093 3098 PBI_SIGVALID=""
3094 3099 PBI_DESC=""
3095 3100 PBI_SHORTDESC=""
  3101 + PBI_MAINTAINER=""
3096 3102 PBI_TAGS=""
3097 3103 PBI_PROGTYPE=""
3098 3104 PBI_CATEGORY=""
@@ -3132,6 +3138,9 @@ load_info_from_dir() {
3132 3138 if [ -e "${1}/pbi_shortdesc" ] ; then
3133 3139 PBI_SHORTDESC="`cat ${1}/pbi_shortdesc`"
3134 3140 fi
  3141 + if [ -e "${1}/pbi_maintainer" ] ; then
  3142 + PBI_MAINTAINER="`cat ${1}/pbi_maintainer`"
  3143 + fi
3135 3144
3136 3145 # Check if auto-update is enabled
3137 3146 if [ -e "${1}/autoupdate-enable" ] ; then
@@ -4372,6 +4381,9 @@ save_pbi_details_to_header() {
4372 4381 if [ -n "$PBI_SHORTDESC" ] ; then
4373 4382 echo "$PBI_SHORTDESC" > ${PBI_HEADERDIR}/pbi_shortdesc
4374 4383 fi
  4384 + if [ -n "$PBI_MAINTAINER" ] ; then
  4385 + echo "$PBI_MAINTAINER" > ${PBI_HEADERDIR}/pbi_maintainer
  4386 + fi
4375 4387
4376 4388 # Custom install / remove scripts
4377 4389 if [ -e "${PBI_CONFDIR}/${PBI_CONF_SCRIPTSDIR}/${MOD_PREINS}" ] ; then
@@ -6906,6 +6918,9 @@ load_pkg_metadata()
6906 6918 if [ -z "$PBI_SHORTDESC" ] ; then
6907 6919 PBI_SHORTDESC="`pkg query '%c' ${PBI_MAKEPORT}`"
6908 6920 fi
  6921 + if [ -z "$PBI_MAINTAINER" ] ; then
  6922 + PBI_MAINTAINER="`pkg query '%m' ${PBI_MAKEPORT}`"
  6923 + fi
6909 6924 if [ -z "$PBI_DESC" ] ; then
6910 6925 PBI_DESC="`pkg query '%e' ${PBI_MAKEPORT}`"
6911 6926 fi

0 comments on commit a497938

Please sign in to comment.
Something went wrong with that request. Please try again.