From 2d95d7c7e3623cab64d1558399336dd530ccfe20 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 23 Jun 2013 22:55:57 +0300
Subject: [PATCH] scripts/create_addon: use addon's own version if provided

---
 scripts/create_addon | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/create_addon b/scripts/create_addon
index 0aed09d4c5..0f82bf8df1 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -55,9 +55,10 @@ if [ -f $PKG_DIR/addon ]; then
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
     if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
       cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+      CUST_ADDON_VERSION="$ADDON_VERSION.$PKG_REV"
       $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
            -e "s|@PKG_NAME@|$PKG_NAME|g" \
-           -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
+           -e "s|@ADDON_VERSION@|$CUST_ADDON_VERSION|g" \
            -e "s|@PKG_ADDON_TYPE@|$PKG_ADDON_TYPE|g" \
            -e "s|@REQUIRES@|$REQUIRES|g" \
            -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
@@ -65,6 +66,8 @@ if [ -f $PKG_DIR/addon ]; then
            -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
            -e "s|@PKG_DISCLAIMER@|$PKG_DISCLAIMER|g" \
            -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
+    else
+      CUST_ADDON_VERSION="$PKG_VERSION"
     fi
 
     if [ -f $PKG_DIR/source/default.py ]; then
@@ -97,15 +100,15 @@ if [ -f $PKG_DIR/addon ]; then
 
   cd $ADDON_BUILD
     echo "*** compressing Addon $PKG_ADDON_ID ... ***"
-    zip -rq $PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $PKG_ADDON_ID;
+    zip -rq $PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $PKG_ADDON_ID;
   cd -
 
   mkdir -p $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
-    cp $ADDON_BUILD/$PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
+    cp $ADDON_BUILD/$PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
     if [ -f $PKG_DIR/changelog.txt ]; then
-      cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt
+      cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt
     elif [ -f $PKG_BUILD/changelog.txt ]; then
-      cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt
+      cp $PKG_BUILD/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$CUST_ADDON_VERSION.txt
     fi
     if [ -f $PKG_DIR/icon/icon.png ]; then
       cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png