Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2013-07-11 20:50:54 +02:00
commit f3fef68aa6
3 changed files with 7 additions and 2 deletions

View File

@ -2,7 +2,7 @@
<addon id="@PKG_ADDON_ID@" <addon id="@PKG_ADDON_ID@"
name="@PKG_NAME@" name="@PKG_NAME@"
version="@ADDON_VERSION@" version="@ADDON_VERSION@"
provider-name="openelec.tv"> provider-name="@PROVIDER_NAME@">
<requires> <requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/> <import addon="os.openelec.tv" version="@OS_VERSION@"/>
<import addon="xbmc.python" version="2.0"/> <import addon="xbmc.python" version="2.0"/>

@ -1 +1 @@
Subproject commit 21ff6a17ffb451bf412303241ba399d1a86c9ce2 Subproject commit 32ea6932482163552d0d7f62d45e6280161275da

View File

@ -56,6 +56,10 @@ if [ -f $PKG_DIR/addon ]; then
if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV" CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV"
PROVIDER_NAME="openelec.tv"
if [ ! -z "$PKG_MAINTAINER" ] ; then
PROVIDER_NAME="$PKG_MAINTAINER"
fi
$SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \ $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
-e "s|@PKG_NAME@|$PKG_NAME|g" \ -e "s|@PKG_NAME@|$PKG_NAME|g" \
-e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \ -e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \
@ -65,6 +69,7 @@ if [ -f $PKG_DIR/addon ]; then
-e "s|@OS_VERSION@|$OS_VERSION|g" \ -e "s|@OS_VERSION@|$OS_VERSION|g" \
-e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \ -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
-e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \ -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
-e "s|@PROVIDER_NAME@|$PROVIDER_NAME|g" \
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
else else
CUST_ADDON_VERSION="$PKG_VERSION" CUST_ADDON_VERSION="$PKG_VERSION"