Merge branch 'master' of http://thinking.zicp.io:3000/home/scbc_repos

crontask/dailybuild_rt2841_2851

@@ -1,4 +1,5 @@
 #!/bin/bash
+WORKSPACE=$(pwd)
 # 是否要重新下载;
 Redownload=$1
 if [ ! $Redownload ]; then
@@ -7,49 +8,56 @@ fi
 echo "Redownload=${Redownload}" 
 
 # 换服务器编译时,这里的PATH要以新服务器的环境变量重新配置
-export PATH=/opt/git-repo:/usr/lib/jvm/java-8-openjdk-amd64/bin:/home/wjf/.platformio/penv/bin:/home/wjf/.platformio/penv:/scbc_data/wjf/.vscode-server/bin/5763d909d5f12fe19f215cbfdd29a91c0fa9208a/bin:/opt/git-repo:/usr/lib/jvm/java-8-openjdk-amd64/bin:/home/wjf/.vscode-server/bin/5763d909d5f12fe19f215cbfdd29a91c0fa9208a/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
+export PATH=/opt/git-repo:/usr/lib/jvm/java-8-openjdk-amd64/bin:/home/wangjianfeng/.vscode-server/bin/d2e414d9e4239a252d1ab117bd7067f125afd80a/bin:/opt/git-repo:/usr/lib/jvm/java-8-openjdk-amd64/bin:/home/wangjianfeng/.vscode-server/bin/d2e414d9e4239a252d1ab117bd7067f125afd80a/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin
 
 # 删除目录;
-cd ~
+cd $WORKSPACE
 if [ $Redownload == true ]; then
     if [ -d "dailybuild" ]; then
-        echo "rm -rf ~/dailybuild begin "$(date +"%Y-%m-%d %T")
-        rm -rf ~/dailybuild
-        echo "rm -rf ~/dailybuild finished "$(date +"%Y-%m-%d %T")
+        echo "rm -rf ${WORKSPACE}/dailybuild begin "$(date +"%Y-%m-%d %T")
+        rm -rf $WORKSPACE/dailybuild
+        echo "rm -rf ${WORKSPACE}/dailybuild finished "$(date +"%Y-%m-%d %T")
     fi
 
     # 创建目录;
     mkdir dailybuild
     echo "mkdir dailybuild finished "$(date +"%Y-%m-%d %T")
+else
+    # 路径是否存在;
+    if [ ! -d $WORKSPACE/dailybuild ]; then
+        Redownload=true
+        # 创建目录;
+        mkdir dailybuild
+    fi
 fi
 
-# 重新更新代码;
-cd ~/dailybuild/
-repo init -u ssh://10.126.16.60:29418/rt2841_manifest -m odin-gms.xml -b master
-echo "repo init dailybuild finished "$(date +"%Y-%m-%d %T")
-repo sync -j12
-echo "repo sync dailybuild finished "$(date +"%Y-%m-%d %T")
-
 if [ $Redownload == true ]; then
-    # 简单防止更新失败,再次重新;
-    echo "repo sync-2 dailybuild start "$(date +"%Y-%m-%d %T")
-    repo sync -j12
-    echo "repo sync-2 dailybuild finished "$(date +"%Y-%m-%d %T")
+    # 重新更新代码;
+    cd $WORKSPACE/dailybuild/
+    repo init -u ssh://10.126.16.60:29418/rt2841_manifest -m odin-gms.xml -b master
+    echo "repo init dailybuild finished "$(date +"%Y-%m-%d %T")
+    repo sync
+    echo "repo sync dailybuild finished "$(date +"%Y-%m-%d %T")
 fi
 
+# 简单防止更新失败,再次重新;
+echo "repo sync-2 dailybuild start "$(date +"%Y-%m-%d %T")
+repo sync
+echo "repo sync-2 dailybuild finished "$(date +"%Y-%m-%d %T")
+
 # 编译2841主干代码;
 echo "Start: Daily build for RT2841 master branch "$(date +"%Y-%m-%d %T")
-cd ~/dailybuild/
+cd $WORKSPACE/dailybuild/
 repo forall -c "pwd && git clean -xfd && git checkout -- ."
-rm -rf ~/dailybuild/kernel/android/pie/out
+rm -rf $WORKSPACE/dailybuild/kernel/android/pie/out
 ./SCBC_build.sh true
 echo "End: Daily build for RT2841 master branch "$(date +"%Y-%m-%d %T")
 
 # 编译2851主干代码;
 echo "Start: Daily build for RT2851 master branch "$(date +"%Y-%m-%d %T")
-cd ~/dailybuild/
+cd $WORKSPACE/dailybuild/
 repo forall -c "pwd && git clean -xfd && git checkout -- ."
-rm -rf ~/dailybuild/kernel/android/pie/out
+rm -rf $WORKSPACE/dailybuild/kernel/android/pie/out
 ./SCBC_build_4K_2851.sh true
 echo "End: Daily build for RT2851 master branch "$(date +"%Y-%m-%d %T")