From 3fcd79ce7c4fd774b349085b0961045c492e2e80 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 9 Dec 2014 00:14:58 +0200
Subject: [PATCH] scripts/create_addon: drop 'custom addon versions'

this only makes things more complicated.. all addons should follow
the $ADDON_VERSION.$PKG_REV versioning. including those with own
addon.xml
---
 scripts/create_addon | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/scripts/create_addon b/scripts/create_addon
index 1c811dd47e..1e7ecd6ef8 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -73,14 +73,13 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
   if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
     cp config/addon/${PKG_ADDON_TYPE}.xml $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
-    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" \
          -e "s|@PKG_NAME@|$PKG_NAME|g" \
-         -e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \
+         -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
          -e "s|@REQUIRES@|$REQUIRES|g" \
          -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
          -e "s|@OS_VERSION@|$OS_VERSION|g" \
@@ -89,11 +88,6 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
          -e "s|@PROVIDER_NAME@|$PROVIDER_NAME|g" \
          -e "s|@EXTENSIONS@|$EXTENSIONS|g" \
          -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
-  else
-    CUST_ADDON_VERSION="$PKG_VERSION"
-  fi
-  if [ ! -z "$PKG_CUSTOM_ADDON_VERSION" ] ; then
-    CUST_ADDON_VERSION="$PKG_CUSTOM_ADDON_VERSION"
   fi
 
   if [ -f $PKG_DIR/source/default.py ]; then
@@ -117,7 +111,7 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
   if [ "$2" != "-test" ] ; then
     cd $ADDON_BUILD
     echo "*** compressing Addon $PKG_ADDON_ID ... ***"
-    zip -rq $PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $PKG_ADDON_ID;
+    zip -rq $PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $PKG_ADDON_ID;
     cd - &>/dev/null
 
     ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID"