open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-24 15:43:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复ql update中reset操作

Browse Source
This commit is contained in:
hanhh 2021-08-03 11:07:05 +08:00
parent e260dcb985
commit c51306ef27
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shell/update.sh
View File

@ -119,7 +119,7 @@ add_cron() {
cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1) cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
[[ -z $cron_name ]] && cron_name="$file_name" [[ -z $cron_name ]] && cron_name="$file_name"
[[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | xargs) [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | xargs)
[[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs) [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs)
[[ -z $cron_line ]] && cron_line="0 6 * * *" [[ -z $cron_line ]] && cron_line="0 6 * * *"
result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name") result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name")
echo -e "$result" echo -e "$result"
@ -193,7 +193,7 @@ update_raw() {
cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1) cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1)
[[ -z $cron_name ]] && cron_name="$raw_file_name" [[ -z $cron_name ]] && cron_name="$raw_file_name"
[[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | xargs) [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | xargs)
[[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs) [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs)
[[ -z $cron_line ]] && cron_line="0 6 * * *" [[ -z $cron_line ]] && cron_line="0 6 * * *"
if [[ -z $cron_id ]]; then if [[ -z $cron_id ]]; then
result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name") result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
@ -238,8 +238,8 @@ update_qinglong() {
local no_restart="$1" local no_restart="$1"
[ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json) [ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json)
reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git" reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git" "master"
git_pull_scripts $dir_root git_pull_scripts $dir_root "master"
if [[ $exit_status -eq 0 ]]; then if [[ $exit_status -eq 0 ]]; then
echo -e "\n更新$dir_root成功...\n" echo -e "\n更新$dir_root成功...\n"
@ -255,12 +255,8 @@ update_qinglong() {
local url="${github_proxy_url}https://github.com/whyour/qinglong-static.git" local url="${github_proxy_url}https://github.com/whyour/qinglong-static.git"
if [ -d ${ql_static_repo}/.git ]; then if [ -d ${ql_static_repo}/.git ]; then
reset_romote_url ${ql_static_repo} ${url} reset_romote_url ${ql_static_repo} ${url} "master"
cd ${ql_static_repo} git_pull_scripts ${ql_static_repo} "master"
git fetch --all
exit_status=$?
git reset --hard origin/master
cd $dir_root
else else
git_clone_scripts ${url} ${ql_static_repo} git_clone_scripts ${url} ${ql_static_repo}
fi fi
@ -298,7 +294,7 @@ patch_version() {
reload_pm2() { reload_pm2() {
pm2 l >/dev/null 2>&1 pm2 l >/dev/null 2>&1
if [[ $(pm2 info panel 2>/dev/null) ]]; then if [[ $(pm2 info panel 2>/dev/null) ]]; then
pm2 reload panel --source-map-support --time >/dev/null 2>&1 pm2 reload panel --source-map-support --time >/dev/null 2>&1
else else

4
src/layouts/index.tsx
View File

@ -29,6 +29,9 @@ export default function (props: any) {
history.push('/login'); history.push('/login');
} }
vhCheck(); vhCheck();
// patch custome layout title as react node [object, object]
document.title = '控制面板';
}, []); }, []);
useEffect(() => { useEffect(() => {
@ -109,7 +112,6 @@ export default function (props: any) {
}, },
]; ];
}} }}
pageTitleRender={() => '控制面板'}
{...defaultProps} {...defaultProps}
> >
{props.children} {props.children}