修复mkota脚本自动更新fs ota包

diff --git a/gen_fs_otapkg.sh b/gen_fs_otapkg.sh
index 17ad194..ad542b4 100644 (file)
--- a/gen_fs_otapkg.sh
+++ b/gen_fs_otapkg.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-#set -e
+# set -ex
 NEWVERSION=HEAD
 OLDVERSION=HEAD
 DATE=$(date  +%Y%m%d.%H%M%S)
@@ -30,10 +30,10 @@ BACKUPDIR_HOME=$HOMEDIR/../PATCHES/$(basename $HOMEDIR)_FSOTA_${DATE}
 
 
 genpatch() {
-tmpfile_changelist=/$TMPDIR/changelist.txt
-tmpfile_removedfiles=/$TMPDIR/deletedfiles.txt
-tmpfile_modified_or_new_files=/$TMPDIR/modified_or_new_files.txt
-tmpfile_git_commit_file=/$TMPDIR/commit.txt
+tmpfile_changelist=$TMPDIR/changelist.txt
+tmpfile_removedfiles=$TMPDIR/deletedfiles.txt
+tmpfile_modified_or_new_files=$TMPDIR/modified_or_new_files.txt
+tmpfile_git_commit_file=$TMPDIR/commit.txt
 BACKUPDIR=$BACKUPDIR_HOME/
 BACKUPDIR_DIFF=$BACKUPDIR_HOME/diff/
 TARGETDIR=$1/$FSDATADIR
@@ -48,11 +48,12 @@ echo $TARGETDIR $count
 if [ "$count" == "0" ] ; then
        echo $TARGETDIR no change
 else
-       
-       echo ${OLDVERSION}...${NEWVERSION} >$tmpfile_git_commit_file
-
-       git diff ${OLDVERSION}...${NEWVERSION} --name-only --diff-filter=ACMR . |awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\//,"") ;print $0 }' >$tmpfile_modified_or_new_files
-       git diff ${OLDVERSION}...${NEWVERSION} --name-only --diff-filter=D . |awk ' ($1 == "D" ) {print $2 }'|awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\//,"") ;print $0 }' >$tmpfile_removedfiles
+       echo ${OLDVERSION}...${NEWVERSION} >$tmpfile_git_commit_file 
+       # echo $PWD
+       # echo "git diff ${OLDVERSION}...${NEWVERSION} --name-only --diff-filter=ACMR . |awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\//,\"\") ;print \$0 }' > $tmpfile_modified_or_new_files"
+       git diff ${OLDVERSION}...${NEWVERSION} --name-only --diff-filter=ACMR . |awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\//,"") ;print $0 }' > $tmpfile_modified_or_new_files
+       # echo "git diff ${OLDVERSION}...${NEWVERSION} --name-only --diff-filter=D . |awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\//,\"\") ;print \$0 }' > $tmpfile_removedfiles"
+       git diff ${OLDVERSION}...${NEWVERSION} --name-only --diff-filter=D . |awk '{gsub(/code\/sdk\/build\/config\/target_config\/brandy\/mk_fs_image\/fd230\//,"") ;print $0 }' > $tmpfile_removedfiles
 
        mkdir -p $BACKUPDIR
        mkdir -p $BACKUPDIR_DIFF

diff --git a/mkota.sh b/mkota.sh
index 82ac5b7..30d6443 100644 (file)
--- a/mkota.sh
+++ b/mkota.sh
@@ -6,6 +6,7 @@ SOURCE_VERSION=`basename $SOURCE_DIR`
 TARGET_DIR=$2
 TARGET_VERSION=`basename $TARGET_DIR`
 RES_DIR=$3
+ROOTDIR=`basename $PWD`
 
 if [ ! -d "$SOURCE_DIR" ] ; then
 echo "$SOURCE_DIR not exist , skip create ota package"
@@ -28,14 +29,14 @@ 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=/tmp/${USER}_F
+TMPDIR=../PATCHES/${ROOTDIR}_FSOTA_F
 rm -rf $TMPDIR
 echo ./gen_fs_otapkg.sh $OLD_COMMIT_VERSION $NEW_COMMIT_VERSION F
 ./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
 cp -f $RES_DIR/diff/deletedfiles.txt code/sdk/output/brandy/TestOTA/delfiles