Changeset 4ca5a5e


Ignore:
Timestamp:
11/12/13 09:42:43 (16 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
90ee280
Parents:
3f8190c7
Message:

Fix the pbi_metatool for 10.x, use a placeholder PNG image when using
the "syncpbi" option to auto-populate the metafile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager10/pbi-manager

    ra497938 r4ca5a5e  
    218218  -u url        -- Application homepage URL 
    219219  -r            -- Application must be installed as root 
     220  -s shortdesc  -- Short description for application 
    220221 
    221222EOF 
     
    554555                        -d) if [ $# -eq 1  ]; then usage_mt_add; fi 
    555556                            shift; PBI_MT_ADDDESC="$1" 
     557                            ;; 
     558                        -s) if [ $# -eq 1  ]; then usage_mt_add; fi 
     559                            shift; PBI_MT_ADDSHORTDESC="$1" 
    556560                            ;; 
    557561                        -c) if [ $# -eq 1  ]; then usage_mt_add; fi 
     
    610614                ADD) # Check the common values  
    611615                     if [ -z "${PBI_MT_ADDNAME}" ] ; then usage_mt_add ; fi 
     616                     if [ -z "${PBI_MT_ADDDESC}" ] ; then usage_mt_add ; fi 
    612617                     if [ -z "${PBI_MT_ADDICON}" ] ; then usage_mt_add ; fi 
    613                      if [ -z "${PBI_MT_ADDDESC}" ] ; then usage_mt_add ; fi 
    614618 
    615619                     if [ "$PBI_MT_TYPE" = "CAT" ]; then               
     
    620624                        if [ -z "${PBI_MT_ADDLIC}" ]; then usage_mt_add ; fi 
    621625                        if [ -z "${PBI_MT_ADDTYPE}" ]; then usage_mt_add ; fi 
    622                         if [ -z "${PBI_MT_ADDKEYWORDS}" ]; then usage_mt_add;fi 
    623626                     else 
    624627                       usage_mt_add 
     
    20462049        load_info_from_header 
    20472050 
    2048         mFlags="add --app" 
     2051        mFlags="add --app -i \"http://images.pbidir.com/progicons/generic.png\"" 
    20492052        if [ -n "$PBI_PROGAUTHOR" ] ; then mFlags="$mFlags -a \"${PBI_PROGAUTHOR}\""; fi 
    20502053        if [ -n "$PBI_CATEGORY" ] ; then mFlags="$mFlags -c \"${PBI_CATEGORY}\""; fi 
     
    20522055        if [ -n "$PBI_MAINTAINER" ] ; then mFlags="$mFlags -m \"${PBI_MAINTAINER}\""; fi 
    20532056        if [ -n "$PBI_TAGS" ] ; then mFlags="$mFlags -k \"${PBI_TAGS}\""; fi 
    2054         if [ -n "$PBI_ICONURL" ] ; then mFlags="$mFlags -i \"${PBI_ICONURL}\""; fi 
    20552057        if [ -n "$PBI_PROGWEB" ] ; then mFlags="$mFlags -u \"${PBI_PROGWEB}\""; fi 
    20562058        if [ -n "$PBI_PROGTYPE" ] ; then mFlags="$mFlags -t \"${PBI_PROGTYPE}\""; fi 
    2057         if [ -n "$PBI_DESC" ] ; then mFlags="$mFlags -d \"`echo $PBI_DESC | sed 's|;||g'`\""; fi 
     2059        if [ -n "$PBI_DESC" ] ; then mFlags="$mFlags -d \"`echo $PBI_DESC | sed 's|;||g' | sed 's|\"||g'`\""; fi 
     2060        if [ -n "$PBI_SHORTDESC" ] ; then mFlags="$mFlags -s \"`echo $PBI_SHORTDESC | sed 's|;||g' | sed 's|\"||g'`\""; fi 
    20582061        if [ -n "$PBI_PROGTYPE" ] ; then mFlags="$mFlags -t \"$PBI_PROGTYPE\""; fi 
    20592062        if [ "$PBI_REQUIRESROOT" = "YES" ] ; then mFlags="$mFlags -r"; fi 
    20602063 
    2061  
    20622064        # Add the app 
    2063         echo "pbi_metatool ${mFlags} -n \"${PBI_PROGNAME}\" `realpath ${PBI_MT_METAFILE}`" >/tmp/.pbiCmd.$$ 
     2065        echo "${0} ${mFlags} -n \"${PBI_PROGNAME}\" `realpath ${PBI_MT_METAFILE}`" >/tmp/.pbiCmd.$$ 
    20642066        chmod 755 /tmp/.pbiCmd.$$ 
    20652067        /tmp/.pbiCmd.$$ 
    20662068        err=$? 
    2067         #rm /tmp/.pbiCmd.$$ 
     2069        rm /tmp/.pbiCmd.$$ 
    20682070        exit $err 
    20692071} 
     
    21102112 
    21112113        cp ${PBI_MT_METAFILE} ${PBI_TMPDIR}/.meta.$$ 
    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}" \ 
     2114        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};${PBI_MT_ADDSHORTDESC};" \ 
    21132115        >> ${PBI_TMPDIR}/.meta.$$ 
    21142116        sort ${PBI_TMPDIR}/.meta.$$ > "${PBI_MT_METAFILE}" 
Note: See TracChangeset for help on using the changeset viewer.