From 7eba87aa2c32d852506f3d45388dbae10a743c60 Mon Sep 17 00:00:00 2001 From: whyour Date: Sat, 3 Apr 2021 21:10:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=5Fpull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/git_diy.sh | 2 +- shell/git_pull.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/shell/git_diy.sh b/shell/git_diy.sh index 74ebf377..83c0a22d 100755 --- a/shell/git_diy.sh +++ b/shell/git_diy.sh @@ -92,7 +92,7 @@ delcron() { [ "$delname" != "" ] && notify "删除 ${author} 失效脚本" "${delname}" } -. /ql/shell/api.sh +. $ShellDir/shell/api.sh get_token if [[ ${gitpullstatus} -eq 0 ]]; then diff --git a/shell/git_pull.sh b/shell/git_pull.sh index b110b3f3..8de49dbf 100755 --- a/shell/git_pull.sh +++ b/shell/git_pull.sh @@ -283,14 +283,14 @@ Import_Conf Random_Pull_Cron # 更新shell -# [ -f $ShellDir/package.json ] && PanelDependOld=$(cat $ShellDir/package.json) -# Git_Pull_Shell -# Git_Pull_Shell_Next +[ -f $ShellDir/package.json ] && PanelDependOld=$(cat $ShellDir/package.json) +Git_Pull_Shell +Git_Pull_Shell_Next ## 更新scripts -# [ -f $ScriptsDir/package.json ] && ScriptsDependOld=$(cat $ScriptsDir/package.json) -# Git_Pull_Scripts -# Git_Pull_Scripts_Next +[ -f $ScriptsDir/package.json ] && ScriptsDependOld=$(cat $ScriptsDir/package.json) +Git_Pull_Scripts +Git_Pull_Scripts_Next ## 调用用户自定义的extra.sh if [[ $EnableExtraShell == true ]]; then