scripts/create_addon: reduce $DEVICE complexity

(cherry picked from commit fbc4fd4e0beea5c2443f34fb69d7eeb1b339990d)
This commit is contained in:
Jonas Karlman 2017-07-11 21:19:07 +02:00
parent bd3c329acb
commit ada645e251

View File

@ -121,11 +121,7 @@ pack_addon() {
debug_strip $ADDON_BUILD/$PKG_ADDON_ID
if [ "$2" != "-test" ] ; then
if [ -n "${DEVICE}" ]; then
ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$DEVICE/$TARGET_ARCH/$PKG_ADDON_ID"
else
ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID"
fi
ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH/$PKG_ADDON_ID"
if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ] ; then
echo "*** WARNING: $PKG_ADDON_ID-$ADDONVER.zip already exists. not overwriting it ***"
return 0
@ -168,11 +164,7 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
$SCRIPTS/build $@
if [ -n "${DEVICE}" ]; then
printf "%${BUILD_INDENT}c CREATE ADDON ($DEVICE/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
else
printf "%${BUILD_INDENT}c CREATE ADDON ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
fi
printf "%${BUILD_INDENT}c CREATE ADDON (${DEVICE:-$PROJECT}/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
rm -rf $ADDON_BUILD