From 0a37f62e26b6e86cf89bc1dfb19d68729dca89b1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 25 Oct 2014 19:57:22 +0300 Subject: [PATCH] scripts/addon: add option to test if addon() fails I need this for my repo buildscripts. --- scripts/create_addon | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/scripts/create_addon b/scripts/create_addon index f3f4ce4f4f..fe76177b26 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -121,23 +121,25 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then echo "*** WARNING: It's recommended to have a $PKG_DIR/changelog.txt file ***" fi - cd $ADDON_BUILD - echo "*** compressing Addon $PKG_ADDON_ID ... ***" - zip -rq $PKG_ADDON_ID-$CUST_ADDON_VERSION.zip $PKG_ADDON_ID; - cd - &>/dev/null + 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; + cd - &>/dev/null - mkdir -p $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-$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-$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 - elif [ -f $PKG_BUILD/icon/icon.png ]; then - cp $PKG_BUILD/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png - elif [ -f $PKG_BUILD/icon.png ]; then - cp $PKG_BUILD/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png + mkdir -p $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-$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-$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 + elif [ -f $PKG_BUILD/icon/icon.png ]; then + cp $PKG_BUILD/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png + elif [ -f $PKG_BUILD/icon.png ]; then + cp $PKG_BUILD/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png + fi fi fi