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

修改仓库拉取状态判断逻辑

Browse Source
This commit is contained in:
whyour 2023-04-24 15:37:58 +08:00
parent 9a3e38051d
commit d6cfb18f06
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/share.sh
View File

@ -318,6 +318,8 @@ git_clone_scripts() {
git clone --depth=1 $part_cmd $url $dir git clone --depth=1 $part_cmd $url $dir
exit_status=$? exit_status=$?
unset_proxy unset_proxy
reset_branch "$branch"
} }
git_pull_scripts() { git_pull_scripts() {
@ -328,12 +330,18 @@ git_pull_scripts() {
cd $dir_work cd $dir_work
echo -e "开始更新仓库：$dir_work" echo -e "开始更新仓库：$dir_work"
local pre_commit_id=$(git rev-parse --short HEAD)
set_proxy "$proxy" set_proxy "$proxy"
git fetch --depth=1 --all git fetch --depth=1 --all
git pull --depth=1 1>/dev/null git pull --depth=1 &>/dev/null
exit_status=$? exit_status=$?
unset_proxy unset_proxy
reset_branch "$branch"
local cur_commit_id=$(git rev-parse --short HEAD)
if [[ $cur_commit_id != $pre_commit_id ]]; then
exit_status=0
fi
cd $dir_current cd $dir_current
} }
@ -351,7 +359,7 @@ reset_romote_url() {
git init git init
git remote add origin $url &>/dev/null git remote add origin $url &>/dev/null
fi fi
reset_branch "$branch"
cd $dir_current cd $dir_current
} }

2
shell/update.sh
View File

@ -254,7 +254,6 @@ update_qinglong() {
if [[ $exit_status -eq 0 ]]; then if [[ $exit_status -eq 0 ]]; then
echo -e "\n更新青龙源文件成功...\n" echo -e "\n更新青龙源文件成功...\n"
reset_romote_url ${dir_root} "https://${mirror}.com/whyour/qinglong.git" ${primary_branch}
cp -f $file_config_sample $dir_config/config.sample.sh cp -f $file_config_sample $dir_config/config.sample.sh
update_depend update_depend
@ -280,7 +279,6 @@ update_qinglong_static() {
fi fi
if [[ $exit_status -eq 0 ]]; then if [[ $exit_status -eq 0 ]]; then
echo -e "\n更新青龙静态资源成功...\n" echo -e "\n更新青龙静态资源成功...\n"
reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
rm -rf $dir_static/* rm -rf $dir_static/*
cp -rf $ql_static_repo/* $dir_static cp -rf $ql_static_repo/* $dir_static