xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

V6.0.4 修复 log 问题

This commit is contained in:
Hyy2001X 2021-06-08 23:37:17 +08:00
parent 54d5dbffcd
commit fdfae38890
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Scripts/AutoUpdate.sh
View File

@ -73,7 +73,7 @@ Release API: ${Github_Tag_URL}
默认下载地址: ${Github_Release_URL} 默认下载地址: ${Github_Release_URL}
固件保存位置: ${FW_SAVE_PATH} 固件保存位置: ${FW_SAVE_PATH}
固件格式: ${Firmware_Type} 固件格式: ${Firmware_Type}
log 文件: ${log_File} log 文件: ${log_Path}/AutoUpdate.log
EOF EOF
[[ ${TARGET_PROFILE} == x86_64 ]] && { [[ ${TARGET_PROFILE} == x86_64 ]] && {
echo "引导模式: ${x86_64_Boot}" echo "引导模式: ${x86_64_Boot}"
@ -86,7 +86,8 @@ RANDOM() {
} }
TIME() { TIME() {
[[ ! -f ${log_File} ]] && touch ${log_File} [[ ! -d ${log_Path} ]] && mkdir -p "${log_Path}"
[[ ! -f ${log_Path}/AutoUpdate.log ]] && touch "${log_Path}/AutoUpdate.log"
[[ -z $1 ]] && { [[ -z $1 ]] && {
echo -ne "\n\e[36m[$(date "+%H:%M:%S")]\e[0m " echo -ne "\n\e[36m[$(date "+%H:%M:%S")]\e[0m "
} || { } || {
@ -99,10 +100,10 @@ TIME() {
esac esac
[[ $# -lt 2 ]] && { [[ $# -lt 2 ]] && {
echo -e "\n\e[36m[$(date "+%H:%M:%S")]\e[0m $1" echo -e "\n\e[36m[$(date "+%H:%M:%S")]\e[0m $1"
echo "[$(date "+%Y-%m-%d-%H:%M:%S")] $1" >> ${log_File} echo "[$(date "+%Y-%m-%d-%H:%M:%S")] $1" >> ${log_Path}/AutoUpdate.log
} || { } || {
echo -e "\n\e[36m[$(date "+%H:%M:%S")]\e[0m ${Color}$2\e[0m" echo -e "\n\e[36m[$(date "+%H:%M:%S")]\e[0m ${Color}$2\e[0m"
echo "[$(date "+%Y-%m-%d-%H:%M:%S")] $2" >> ${log_File} echo "[$(date "+%Y-%m-%d-%H:%M:%S")] $2" >> ${log_Path}/AutoUpdate.log
} }
} }
} }
@ -211,7 +212,7 @@ CHANGE_BOOT() {
GET_VARIABLE() { GET_VARIABLE() {
[[ $# != 2 ]] && SHELL_HELP 1 $* [[ $# != 2 ]] && SHELL_HELP 1 $*
[[ ! -f $2 ]] && TIME "未检测到定义文件: [$2] !" && exit 1 [[ ! -f $2 ]] && TIME "未检测到定义文件: [$2] !" && exit 1
echo -e "$(grep "$1" $2 | cut -c$(echo $1 | wc -c)-200)" echo -e "$(grep "$1" $2 | cut -c$(echo $1 | wc -c)-200 | awk 'NR==1')"
} }
UPDATE_SCRIPT() { UPDATE_SCRIPT() {
@ -263,7 +264,6 @@ CHECK_UPDATES() {
[[ $1 == check ]] && echo "获取失败" > /tmp/Cloud_Version [[ $1 == check ]] && echo "获取失败" > /tmp/Cloud_Version
TIME r "检查更新失败,请稍后重试!" TIME r "检查更新失败,请稍后重试!"
exit 1 exit 1
exit 1
} }
eval X=$(GET_VARIABLE Egrep_Firmware= ${Default_Variable}) eval X=$(GET_VARIABLE Egrep_Firmware= ${Default_Variable})
FW_Name=$(egrep -o "${X}" ${FW_SAVE_PATH}/Github_Tags | awk 'END {print}') FW_Name=$(egrep -o "${X}" ${FW_SAVE_PATH}/Github_Tags | awk 'END {print}')
@ -433,8 +433,8 @@ REMOVE_FW_CACHE() {
esac esac
} }
export Version=V6.0.3 export Version=V6.0.4
export log_File=/tmp/AutoUpdate.log export log_Path=/tmp
export Upgrade_Command=sysupgrade export Upgrade_Command=sysupgrade
export Default_Variable=/etc/AutoBuild/Default_Variable export Default_Variable=/etc/AutoBuild/Default_Variable
export Custom_Variable=/etc/AutoBuild/Custom_Variable export Custom_Variable=/etc/AutoBuild/Custom_Variable
@ -555,12 +555,13 @@ while [[ $1 ]];do
exit exit
;; ;;
--log) --log)
TITLE && echo && cat ${log_File} TITLE && echo && cat ${log_Path}/AutoUpdate.log
;; ;;
--log-path) --log-path)
shift shift
[[ -z $* ]] && SHELL_HELP 1 $* [[ -z $* ]] && SHELL_HELP 1 $*
EDIT_VARIABLE edit ${Custom_Variable} log_File $1/AutoUpdate.log EDIT_VARIABLE rm ${Custom_Variable} log_Path
EDIT_VARIABLE edit ${Custom_Variable} log_Path $1
[[ ! -d $1 ]] && mkdir -p $1 [[ ! -d $1 ]] && mkdir -p $1
TIME y "AutoUpdate 日志位置已修改为: $1/AutoUpdate.log" TIME y "AutoUpdate 日志位置已修改为: $1/AutoUpdate.log"
;; ;;