mirror of
https://github.com/whyour/qinglong.git
synced 2025-07-07 20:06:08 +08:00
修改 git_pull 逻辑
This commit is contained in:
parent
f0f738f8a2
commit
e4339ab204
4
.github/workflows/docker.yml
vendored
4
.github/workflows/docker.yml
vendored
|
@ -1,8 +1,8 @@
|
|||
name: Publish Docker Image
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
tags:
|
||||
- v*
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
|
|
@ -23,7 +23,7 @@ ContentDropTask=${ShellDir}/drop_task
|
|||
SendCount=${ShellDir}/send_count
|
||||
isTermux=${ANDROID_RUNTIME_ROOT}${ANDROID_ROOT}
|
||||
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 {
|
||||
|
@ -56,14 +56,11 @@ function Update_Cron {
|
|||
function Git_PullShell {
|
||||
echo -e "更新shell...\n"
|
||||
cd ${ShellDir}
|
||||
git config --global user.email "noreplay@githb.com"
|
||||
git config --global user.name "noreplay"
|
||||
git remote set-url origin $ShellURL
|
||||
git fetch --all
|
||||
git stash
|
||||
git pull
|
||||
git stash pop
|
||||
git reset --mixed
|
||||
ExitStatusShell=$?
|
||||
git reset --hard origin/master
|
||||
git pull
|
||||
echo
|
||||
}
|
||||
|
||||
|
@ -90,18 +87,11 @@ function Git_CloneScripts {
|
|||
function Git_PullScripts {
|
||||
echo -e "更新scripts...\n"
|
||||
cd ${ScriptsDir}
|
||||
git config --global user.email "noreplay@githb.com"
|
||||
git config --global user.name "noreplay"
|
||||
git remote set-url origin $ShellURL
|
||||
git fetch --all
|
||||
git rm -f --ignore-unmatch i-chenzhe*
|
||||
git rm -f --ignore-unmatch moposmall*
|
||||
git rm -f --ignore-unmatch qq34347476*
|
||||
git rm -f --ignore-unmatch whyour*
|
||||
git stash
|
||||
git pull
|
||||
git stash pop
|
||||
git reset --mixed
|
||||
ExitStatusScripts=$?
|
||||
git reset --hard origin/master
|
||||
git pull
|
||||
echo
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user