From c744ac0ffd7cd2f7f687e290a9dfc256c13804eb Mon Sep 17 00:00:00 2001 From: Rick Lan Date: Fri, 4 Dec 2020 12:50:46 +1000 Subject: [PATCH] * Added git error fix. (Thanks to @toyboxZ) --- CHANGELOGS-DEV.md | 2 ++ CHANGELOGS-REL.md | 2 ++ CHANGELOGS.md | 5 +++++ launch_openpilot.sh | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/CHANGELOGS-DEV.md b/CHANGELOGS-DEV.md index 036b34f8f..00c328a03 100644 --- a/CHANGELOGS-DEV.md +++ b/CHANGELOGS-DEV.md @@ -2,6 +2,8 @@ dragonpilot 0.8.0 ======================== * 基於最新 openpilot 0.8.0 devel. * Based on latest openpilot 0.8.0 devel. +* 加入 git 錯誤修正。(感謝 @toyboxZ 提供) +* Added git error fix. (Thanks to @toyboxZ) dragonpilot 0.7.10.1 ======================== diff --git a/CHANGELOGS-REL.md b/CHANGELOGS-REL.md index 826ca5e13..0642e27b1 100644 --- a/CHANGELOGS-REL.md +++ b/CHANGELOGS-REL.md @@ -2,6 +2,8 @@ dragonpilot 0.8.0 ======================== * 基於最新 openpilot 0.8.0 devel. * Based on latest openpilot 0.8.0 devel. +* 加入 git 錯誤修正。(感謝 @toyboxZ 提供) +* Added git error fix. (Thanks to @toyboxZ) dragonpilot 0.7.10.0 ======================== diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 206edf39f..35b33e3d3 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,3 +1,8 @@ +2020-12-02 (0.8.0.0) +======================== +* 加入 git 錯誤修正。(感謝 @toyboxZ 提供) +* Added git error fix. (Thanks to @toyboxZ) + 2020-12-02 (0.8.0.0) ======================== * 基於最新 openpilot 0.8.0 devel. diff --git a/launch_openpilot.sh b/launch_openpilot.sh index fb58f576d..44ef1f861 100755 --- a/launch_openpilot.sh +++ b/launch_openpilot.sh @@ -1,4 +1,10 @@ #!/usr/bin/bash +size=$(du -sb .git/index 2>/dev/null|awk '{print $1}') +echo $size|grep -E '^[0-9]+$' >/dev/null || size=0 +if [ $size -le 1024 ];then + rm .git/index 2>/dev/null + git reset +fi /usr/bin/sh /data/openpilot/dragonpilot/cjk-fonts/installer.sh & export PASSIVE="0" exec ./launch_chffrplus.sh