优化mkota.sh，给需要使用到的脚本和工具自动添加可执行权限

diff --git a/mkota.sh b/mkota.sh
index 4d789f5..17b1a98 100755 (executable)
--- a/mkota.sh
+++ b/mkota.sh
@@ -11,6 +11,8 @@ ADDITIONAL_RES_DIR=$PWD/code/sdk/output/additional_fs
 OTA_ALL_FLAG_PATH=$PWD/code/sdk/output/ota_all
 RES_ONLY_FLAG_PATH=$PWD/code/sdk/output/res_only
 OTA_DIFF_FLAG_PATH=$PWD/code/sdk/output/ota_diff
+
+chmod +x ./tools/* -R
 if [ ! -d "$SOURCE_DIR" ] ; then
 echo "$SOURCE_DIR not exist , skip create ota package"
 echo ""

diff --git a/tools/scripts/mkota.sh b/tools/scripts/mkota.sh
deleted file mode 100644 (file)
index 4d789f5..0000000
--- a/tools/scripts/mkota.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-
-if [ "$#" == "2" ] || [ "$#" == "3" ] ; then
-SOURCE_DIR=$1
-SOURCE_VERSION=`basename $SOURCE_DIR`
-TARGET_DIR=$2
-TARGET_VERSION=`basename $TARGET_DIR`
-RES_DIR=$3
-ROOTDIR=`basename $PWD`
-ADDITIONAL_RES_DIR=$PWD/code/sdk/output/additional_fs
-OTA_ALL_FLAG_PATH=$PWD/code/sdk/output/ota_all
-RES_ONLY_FLAG_PATH=$PWD/code/sdk/output/res_only
-OTA_DIFF_FLAG_PATH=$PWD/code/sdk/output/ota_diff
-if [ ! -d "$SOURCE_DIR" ] ; then
-echo "$SOURCE_DIR not exist , skip create ota package"
-echo ""
-exit 0
-fi
-if [ ! -d "$TARGET_DIR" ] ; then
-echo "$TARGET_DIR not exist , skip create ota package"
-echo ""
-exit 0
-fi
-
-rm $OTA_ALL_FLAG_PATH $RES_ONLY_FLAG_PATH $OTA_DIFF_FLAG_PATH -f
-if [ "$3" == "ota_all" ]; then
-touch $OTA_ALL_FLAG_PATH
-OTA_PKG_HEAD=ota_all_
-elif [ "$3" == "ota_diff" ]; then
-touch $OTA_DIFF_FLAG_PATH
-OTA_PKG_HEAD=ota_diff_
-elif [ "$3" == "res_only" ]; then
-touch $RES_ONLY_FLAG_PATH
-OTA_PKG_HEAD=res_only_
-else
-OTA_PKG_HEAD=ota_
-fi
-
-
-mkdir code/sdk/output/brandy/TestOTA/ -p
-rm -rf code/sdk/output/brandy/TestOTA/*
-
-cp -r $SOURCE_DIR  code/sdk/output/brandy/TestOTA/oldsoftware
-cp -r $TARGET_DIR  code/sdk/output/brandy/TestOTA/newsoftware
-
-
-OLD_COMMIT_VERSION=`cat  code/sdk/output/brandy/TestOTA/oldsoftware/readme.txt | awk '$1 == "commit" { print $2}'`
-NEW_COMMIT_VERSION=`cat  code/sdk/output/brandy/TestOTA/newsoftware/readme.txt | awk '$1 == "commit" { print $2}'`
-
-TMPDIR=../PATCHES/${ROOTDIR}_FSOTA_F
-rm -rf $TMPDIR
-echo ./tools/scripts/gen_fs_otapkg.sh $OLD_COMMIT_VERSION $NEW_COMMIT_VERSION F
-#./tools/scripts/gen_fs_otapkg_git.sh $OLD_COMMIT_VERSION $NEW_COMMIT_VERSION F
-./tools/scripts/gen_fs_otapkg.sh $OLD_COMMIT_VERSION $NEW_COMMIT_VERSION F
-if [ -d "$TMPDIR" ] ; then
-RES_DIR=$TMPDIR
-fi
-# echo resdir = $RES_DIR  = $TMPDIR
-if [ -d "$RES_DIR" ] ; then
-cp -r $RES_DIR/fs code/sdk/output/brandy/TestOTA/res_file
-fi
-
-if [ -e "$RES_DIR/diff/deletedfiles.txt" ]; then
-echo cp -f $RES_DIR/diff/deletedfiles.txt code/sdk/output/brandy/TestOTA/delfiles
-cp -f $RES_DIR/diff/deletedfiles.txt code/sdk/output/brandy/TestOTA/delfiles
-fi
-
-if [ -d "$ADDITIONAL_RES_DIR/fs" ]; then
-echo cp -rf $ADDITIONAL_RES_DIR/fs/ code/sdk/output/brandy/TestOTA/res_file/
-cp -rf $ADDITIONAL_RES_DIR/fs/ code/sdk/output/brandy/TestOTA/res_file/
-else
-echo $ADDITIONAL_RES_DIR/fs not exist, you can put additional resource file to there.
-fi
-
-if [ -e "$ADDITIONAL_RES_DIR/delfiles" ]; then
-cat $ADDITIONAL_RES_DIR/delfiles >> code/sdk/output/brandy/TestOTA/delfiles
-else
-echo $ADDITIONAL_RES_DIR/delfiles not exist, you can put filelist to this file , for adding them to del list in fota file.
-fi
-
-cd $PWD/code/sdk/
-./build/config/target_config/brandy/build_brandy_update.py
-cd -
-
-mkdir release/ota -p
-
-target_fwpkg_filepath=release/ota/${OTA_PKG_HEAD}${SOURCE_VERSION}_2_${TARGET_VERSION}.fwpkg
-cp code/sdk/output/brandy/TestOTA/upgrade/update.fwpkg $target_fwpkg_filepath
-fwpkg_filesize=`ls $target_fwpkg_filepath -lh|awk '{print $5}'`
-
-echo create ota file $target_fwpkg_filepath $fwpkg_filesize done
-else
-
-echo ""
-echo "usage: $0 source_release target_release [ota_all]"
-echo ""
-
-fi
-