修改 git_pull 逻辑

This commit is contained in:
whyour 2021-03-30 10:02:50 +08:00
parent f0f738f8a2
commit e4339ab204
2 changed files with 11 additions and 21 deletions

View File

@ -1,8 +1,8 @@
name: Publish Docker Image name: Publish Docker Image
on: on:
push: push:
branches: tags:
- master - v*
jobs: jobs:
build: build:

View File

@ -23,7 +23,7 @@ ContentDropTask=${ShellDir}/drop_task
SendCount=${ShellDir}/send_count SendCount=${ShellDir}/send_count
isTermux=${ANDROID_RUNTIME_ROOT}${ANDROID_ROOT} isTermux=${ANDROID_RUNTIME_ROOT}${ANDROID_ROOT}
ShellURL=https://github.com.cnpmjs.org/whyour/qinglong ShellURL=https://github.com.cnpmjs.org/whyour/qinglong
ScriptsURL=https://gitee.com/highdimen/clone_scripts ScriptsURL=https://github.com/gossh520/jd_scripts
## 导入配置文件 ## 导入配置文件
function Import_Conf { function Import_Conf {
@ -56,14 +56,11 @@ function Update_Cron {
function Git_PullShell { function Git_PullShell {
echo -e "更新shell...\n" echo -e "更新shell...\n"
cd ${ShellDir} cd ${ShellDir}
git config --global user.email "noreplay@githb.com" git remote set-url origin $ShellURL
git config --global user.name "noreplay"
git fetch --all git fetch --all
git stash
git pull
git stash pop
git reset --mixed
ExitStatusShell=$? ExitStatusShell=$?
git reset --hard origin/master
git pull
echo echo
} }
@ -89,19 +86,12 @@ function Git_CloneScripts {
## 更新scripts ## 更新scripts
function Git_PullScripts { function Git_PullScripts {
echo -e "更新scripts...\n" echo -e "更新scripts...\n"
cd ${ScriptsDir} cd ${ScriptsDir}
git config --global user.email "noreplay@githb.com" git remote set-url origin $ShellURL
git config --global user.name "noreplay" git fetch --all
git fetch --all ExitStatusScripts=$?
git rm -f --ignore-unmatch i-chenzhe* git reset --hard origin/master
git rm -f --ignore-unmatch moposmall*
git rm -f --ignore-unmatch qq34347476*
git rm -f --ignore-unmatch whyour*
git stash
git pull git pull
git stash pop
git reset --mixed
ExitStatusScripts=$?
echo echo
} }