更新mkota相关脚本，出错中途可以退出，方便观察结果。

diff --git a/mkota.sh b/mkota.sh
index 17b1a98..2e030d7 100755 (executable)
--- a/mkota.sh
+++ b/mkota.sh
@@ -54,6 +54,11 @@ 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 [ $? != 0 ];
+then
+    echo gen_ota_fs_diff failed!
+    exit 1
+fi
 if [ -d "$TMPDIR" ] ; then
 RES_DIR=$TMPDIR
 fi
@@ -82,12 +87,23 @@ fi
 
 cd $PWD/code/sdk/
 ./build/config/target_config/brandy/build_brandy_update.py
+if [ $? != 0 ];
+then
+    echo create ota file failed!
+    cd - 
+    exit 1
+fi
 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
+if [ $? != 0 ];
+then
+    echo copy firmware failed!
+    exit 1
+fi
 fwpkg_filesize=`ls $target_fwpkg_filepath -lh|awk '{print $5}'`
 
 echo create ota file $target_fwpkg_filepath $fwpkg_filesize done

diff --git a/tools/scripts/compare_folder.py b/tools/scripts/compare_folder.py
index 68a858f..d0d09ea 100644 (file)
--- a/tools/scripts/compare_folder.py
+++ b/tools/scripts/compare_folder.py
@@ -106,8 +106,10 @@ def creat_fs_patch(aPath,bPath,target_path):
             create_dirs(target_dir)
             src_file=aPath+of
             cmd = "cp " + src_file +" "+target_dir
-            os.system(cmd)
-            # print(cmd)
+            cmdret = os.system(cmd)
+            if (cmdret != 0):
+                print(cmdret)
+                exit(1)
 
     if len(diffAB) > 0:
         create_dirs(target_fs_path)
@@ -117,8 +119,10 @@ def creat_fs_patch(aPath,bPath,target_path):
             create_dirs(target_dir)
             src_file=aPath+of
             cmd = "cp " + src_file +" "+target_dir
-            os.system(cmd)
-            # print(cmd)
+            cmdret = os.system(cmd)
+            if (cmdret != 0):
+                print(cmdret)
+                exit(1)
 
     if len(onlyInB) >0:
         create_dirs(target_path+"/diff")
@@ -135,7 +139,7 @@ if __name__ == '__main__':
     aPath = sys.argv[1]
     bPath = sys.argv[2]
     target_tmp_dir = sys.argv[3]
-    print("{} {} vs {} to {}".format(os.getcwd(),aPath,bPath,target_tmp_dir))
+    # print("{} {} vs {} to {}".format(os.getcwd(),aPath,bPath,target_tmp_dir))
     dirCompare(aPath, bPath)
     creat_fs_patch(aPath,bPath,target_tmp_dir)
     # print("\ndone!")

diff --git a/tools/scripts/gen_fs_otapkg.sh b/tools/scripts/gen_fs_otapkg.sh
index 04672eb..87896d3 100644 (file)
--- a/tools/scripts/gen_fs_otapkg.sh
+++ b/tools/scripts/gen_fs_otapkg.sh
@@ -23,16 +23,27 @@ echo $OLDVERSION
 echo TMPDIR=$TMPDIR
 echo HOMEDIR=$HOMEDIR
 
-echo get diff $OLDVERSION ... $NEWVERSION to $TMPDIR
+# echo get diff $OLDVERSION ... $NEWVERSION to $TMPDIR
 
 BACKUPDIR_HOME=$HOMEDIR/../PATCHES/$(basename $HOMEDIR)_FSOTA_${DATE}
 rm -rf $BACKUPDIR_HOME
 mkdir -p $BACKUPDIR_HOME
 
 python $UNYAFFS_SCRIPT $NEWVERSION/bin/file.bin  $BACKUPDIR_HOME/new
+if [ $? != 0 ]
+then
+exit 1
+fi
 python $UNYAFFS_SCRIPT $OLDVERSION/bin/file.bin  $BACKUPDIR_HOME/old
+if [ $? != 0 ]
+then
+exit 2
+fi
 python $COMPARE_FOLDER_SCRIPT $BACKUPDIR_HOME/new $BACKUPDIR_HOME/old $BACKUPDIR_HOME
-
+if [ $? != 0 ]
+then
+exit 3
+fi
 
 echo done