mirror of
https://github.com/whyour/qinglong.git
synced 2025-05-26 09:06:08 +08:00
回退update.sh
This commit is contained in:
parent
9c84c7bd38
commit
4cae9bcfb9
|
@ -423,17 +423,6 @@ get_uniq_path() {
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
show_log="false"
|
|
||||||
while getopts ":l" opt
|
|
||||||
do
|
|
||||||
case $opt in
|
|
||||||
l)
|
|
||||||
show_log="true"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
[[ "$show_log" == "true" ]] && shift $(($OPTIND - 1))
|
|
||||||
|
|
||||||
local p1=$1
|
local p1=$1
|
||||||
local p2=$2
|
local p2=$2
|
||||||
local p3=$3
|
local p3=$3
|
||||||
|
@ -442,32 +431,26 @@ main() {
|
||||||
local p6=$6
|
local p6=$6
|
||||||
local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
|
local log_time=$(date "+%Y-%m-%d-%H-%M-%S")
|
||||||
local log_path="$dir_log/update/${log_time}_$p1.log"
|
local log_path="$dir_log/update/${log_time}_$p1.log"
|
||||||
|
|
||||||
local cmd=">> $log_path"
|
|
||||||
[[ "$show_log" == "true" ]] && cmd=""
|
|
||||||
|
|
||||||
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
|
local begin_time=$(date '+%Y-%m-%d %H:%M:%S')
|
||||||
case $p1 in
|
case $p1 in
|
||||||
update)
|
update)
|
||||||
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
|
echo -e "## 开始执行... $begin_time\n" >> $log_path
|
||||||
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
|
cat $task_error_log_path >> $log_path
|
||||||
eval update_qinglong "$2" $cmd
|
update_qinglong "$2" >> $log_path
|
||||||
;;
|
;;
|
||||||
extra)
|
extra)
|
||||||
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
|
echo -e "## 开始执行... $begin_time\n" >> $log_path
|
||||||
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
|
cat $task_error_log_path >> $log_path
|
||||||
eval run_extra_shell $cmd
|
run_extra_shell >> $log_path
|
||||||
;;
|
;;
|
||||||
repo)
|
repo)
|
||||||
get_user_info
|
get_user_info
|
||||||
get_uniq_path "$p2" "$p6"
|
get_uniq_path "$p2" "$p6"
|
||||||
log_path="$dir_log/update/${log_time}_${uniq_path}.log"
|
log_path="$dir_log/update/${log_time}_${uniq_path}.log"
|
||||||
[[ "$show_log" == "false" ]] && cmd=">> $log_path"
|
echo -e "## 开始执行... $begin_time\n" >> $log_path
|
||||||
|
cat $task_error_log_path >> $log_path
|
||||||
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
|
|
||||||
[[ -f $task_error_log_path ]] && cat $task_error_log_path $cmd
|
|
||||||
if [[ -n $p2 ]]; then
|
if [[ -n $p2 ]]; then
|
||||||
eval update_repo "$p2" "$p3" "$p4" "$p5" "$p6" $cmd
|
update_repo "$p2" "$p3" "$p4" "$p5" "$p6" >> $log_path
|
||||||
else
|
else
|
||||||
echo -e "命令输入错误...\n"
|
echo -e "命令输入错误...\n"
|
||||||
usage
|
usage
|
||||||
|
@ -477,31 +460,29 @@ main() {
|
||||||
get_user_info
|
get_user_info
|
||||||
get_uniq_path "$p2"
|
get_uniq_path "$p2"
|
||||||
log_path="$dir_log/update/${log_time}_${uniq_path}.log"
|
log_path="$dir_log/update/${log_time}_${uniq_path}.log"
|
||||||
[[ "$show_log" == "false" ]] && cmd=">> $log_path"
|
echo -e "## 开始执行... $begin_time\n" >> $log_path
|
||||||
|
cat $task_error_log_path >> $log_path
|
||||||
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
|
|
||||||
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
|
|
||||||
if [[ -n $p2 ]]; then
|
if [[ -n $p2 ]]; then
|
||||||
eval update_raw "$p2" $cmd
|
update_raw "$p2" >> $log_path
|
||||||
else
|
else
|
||||||
echo -e "命令输入错误...\n"
|
echo -e "命令输入错误...\n"
|
||||||
usage
|
usage
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
rmlog)
|
rmlog)
|
||||||
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
|
echo -e "## 开始执行... $begin_time\n" >> $log_path
|
||||||
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
|
cat $task_error_log_path >> $log_path
|
||||||
eval . $dir_shell/rmlog.sh "$p2" $cmd
|
. $dir_shell/rmlog.sh "$p2" >> $log_path
|
||||||
;;
|
;;
|
||||||
bot)
|
bot)
|
||||||
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
|
echo -e "## 开始执行... $begin_time\n" >> $log_path
|
||||||
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
|
cat $task_error_log_path >> $log_path
|
||||||
eval . $dir_shell/bot.sh $cmd
|
. $dir_shell/bot.sh >> $log_path
|
||||||
;;
|
;;
|
||||||
check)
|
check)
|
||||||
eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
|
echo -e "## 开始执行... $begin_time\n" >> $log_path
|
||||||
[[ -f $task_error_log_path ]] && eval cat $task_error_log_path $cmd
|
cat $task_error_log_path >> $log_path
|
||||||
eval . $dir_shell/check.sh $cmd
|
. $dir_shell/check.sh >> $log_path
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo -e "命令输入错误...\n"
|
echo -e "命令输入错误...\n"
|
||||||
|
@ -510,8 +491,8 @@ main() {
|
||||||
esac
|
esac
|
||||||
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
|
local end_time=$(date '+%Y-%m-%d %H:%M:%S')
|
||||||
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
|
local diff_time=$(($(date +%s -d "$end_time") - $(date +%s -d "$begin_time")))
|
||||||
eval echo -e "\\\n\#\# 执行结束... $end_time 耗时 $diff_time 秒" $cmd
|
echo -e "\n## 执行结束... $end_time 耗时 $diff_time 秒" >> $log_path
|
||||||
[[ -f $log_path ]] && cat $log_path
|
cat $log_path
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user