Merge pull request #625 from drieschel/image-script

scripts/image: $RELEASE_DIR removing fix for Amlogic builds and cleanup

scripts/image

@@ -274,12 +274,12 @@ fi
 
   # create release dir
   mkdir -p $RELEASE_DIR
+    
   # remove n previous created release image
   rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz
   if [ -n "$BOOTLOADER" ]; then
 
     BOOTLOADER_DIR=""
-
     if [ -z "$BOOTLOADER_DIR" -a -d $HOME/.openelec/projects/$PROJECT/packages ]; then
       BOOTLOADER_DIR=`find $HOME/.openelec/projects/$PROJECT/packages -type d -name $BOOTLOADER 2>/dev/null`
     fi
@@ -315,7 +315,6 @@ fi
   # only for matrix system or all? (one tar for all updates?)
   if [ "$PROJECT" == "imx6" -a "$SYSTEM" == "matrix" ]; then
     $SCRIPTS/unpack imx6-mfgtool2-tbs-matrix
-
      mkdir -p $RELEASE_DIR/MfgTool2-TBS-Matrix
      cp -PR $BUILD/imx6-mfgtool2-tbs-matrix-*/* $RELEASE_DIR/MfgTool2-TBS-Matrix
   fi
@@ -334,6 +333,7 @@ fi
   mkdir -p $RELEASE_DIR/target
   cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/target/SYSTEM
   cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/target/KERNEL
+
   # create md5sum's
   ( cd $RELEASE_DIR;
     md5sum -t target/SYSTEM > target/SYSTEM.md5;
@@ -377,7 +377,7 @@ fi
       IMAGE_NAME="$IMAGE_NAME" \
       BOOTLOADER="$BOOTLOADER" \
       KERNEL_NAME="$KERNEL_NAME" \
-          RELEASE_DIR="$RELEASE_DIR" \
+      RELEASE_DIR=$RELEASE_DIR \
       UUID_SYSTEM="$(uuidgen)" \
       UUID_STORAGE="$(uuidgen)" \
       UBOOT_SYSTEM="$UBOOT_SYSTEM" \
@@ -432,11 +432,12 @@ fi
     java -Xmx1024m -jar $SIGNAPK_DIR/signapk.jar -w $SIGNAPK_DIR/testkey.x509.pem $SIGNAPK_DIR/testkey.pk8 update.zip sign/$IMAGE_NAME-update.zip
 
     # create the auto-install package
-        if [ -f "$INSTALL_SRC_DIR/files/recovery.img" ]; then
     echo "Creating Amlogic ZIP auto-install package"
     pushd sign > /dev/null
     echo --update_package=/sdcard/$IMAGE_NAME-update.zip > factory_update_param.aml        
+    if [ -f "$INSTALL_SRC_DIR/files/recovery.img" ]; then
       cp $INSTALL_SRC_DIR/files/recovery.img .
+    fi
         
     if [ -f $INSTALL_SRC_DIR/files/aml_autoscript ]; then
       cp $INSTALL_SRC_DIR/files/aml_autoscript .
@@ -448,21 +449,13 @@ fi
     fi
 
     zip -q $TARGET_IMG/$IMAGE_NAME.zip *
-          popd > /dev/null
-        fi
     
     popd > /dev/null
-
+    popd > /dev/null
-        # cleanup release dir
-        rm -rf $RELEASE_DIR
     
   elif [ "$1" = "noobs" ]; then
-
     RELEASE_DIR="$TARGET_IMG/${IMAGE_NAME}-$1"
 
-        # cleanup
-          rm -rf $RELEASE_DIR
-
     # create release dir
     mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}
 
@@ -482,7 +475,6 @@ fi
     cp $ROOT/README* $RELEASE_DIR/${DISTRONAME}_${PROJECT}
     cp $ROOT/CHANGELOG $RELEASE_DIR/${DISTRONAME}_${PROJECT}/release_notes.txt
 
-
     sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
         -e "s%@PROJECT@%$PROJECT%g" \
         -e "s%@LIBREELEC_VERSION@%$LIBREELEC_VERSION%g" \
@@ -561,8 +553,10 @@ fi
 
     # create release tarball
     tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET ${IMAGE_NAME}-$1
+  fi
 
-        # cleanup noobs dir
+  if [ -d $RELEASE_DIR ]; then
+    # cleanup release dir
     rm -rf $RELEASE_DIR
   fi
 fi