diff --git a/scripts/install_addon b/scripts/install_addon index 746d753b27..a7ec4b9d81 100755 --- a/scripts/install_addon +++ b/scripts/install_addon @@ -35,13 +35,13 @@ 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 - ADDONVER=$ADDON_VERSION.$PKG_REV + ADDONVER=${PKG_ADDON_VERSION:-${ADDON_VERSION}.${PKG_REV}} else if [ ! $(which xmlstarlet) ]; then echo "*** ERROR: $ADDON has addon.xml shipped, you need 'xmlstarlet' ***" exit 255 fi - ADDONVER="$(xmlstarlet sel -t -v "/addon/@version" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml).$PKG_REV" + ADDONVER="${PKG_ADDON_VERSION:-$(xmlstarlet sel -t -v "/addon/@version" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml).$PKG_REV}" xmlstarlet ed --inplace -u "/addon[@version]/@version" -v "$ADDONVER" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml fi @@ -87,7 +87,7 @@ fi $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \ -e "s|@ADDON_NAME@|$ADDON_NAME|g" \ - -e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \ + -e "s|@ADDON_VERSION@|$ADDONVER|g" \ -e "s|@REQUIRES@|$REQUIRES|g" \ -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \ -e "s|@OS_VERSION@|$OS_VERSION|g" \