Merge branch 'master' into dev

# Conflicts:
#	ShellCrash.tar.gz
#	bin/version
#	scripts/menus/5_task.sh
#	version

scripts/libs/logger.sh

@@ -4,15 +4,16 @@ __IS_LIB_LOGGER=1
 
 #日志工具
 . "$CRASHDIR"/libs/web_json.sh
-#$1日志内容$2显示颜色$3是否推送
+#$1日志内容$2显示颜色$3是否推送$4是否覆盖上一条
 logger() { 
 	TMPDIR=/tmp/ShellCrash
     [ -n "$2" -a "$2" != 0 ] && printf "\033[%sm%s\033[0m\n" "$2" "$1"
     log_text="$(date "+%G-%m-%d_%H:%M:%S")~$1"
+	[ "$4" = on ] && sed -i "/$1/d" "$TMPDIR"/ShellCrash.log
     echo "$log_text" >>"$TMPDIR"/ShellCrash.log
     [ "$(wc -l "$TMPDIR"/ShellCrash.log | awk '{print $1}')" -gt 199 ] && sed -i '1,20d' "$TMPDIR"/ShellCrash.log
 	#推送远程日志
-    [ -z "$3" ] && {
+    [ "$3" != off ] && {
         [ -n "$device_name" ] && log_text="$log_text($device_name)"
         [ -n "$push_TG" ] && {
             url="https://api.telegram.org/bot${push_TG}/sendMessage"