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

修复shell更新命令

Browse Source
This commit is contained in:
whyour 2022-03-06 11:27:48 +08:00
parent 0c54ca95d9
commit f117f6b39c
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/share.sh
View File

@ -165,6 +165,8 @@ define_cmd() {
} }
fix_config() { fix_config() {
make_dir $dir_static
make_dir $dir_data
make_dir $dir_config make_dir $dir_config
make_dir $dir_log make_dir $dir_log
make_dir $dir_db make_dir $dir_db
@ -316,14 +318,12 @@ git_pull_scripts() {
local dir_current=$(pwd) local dir_current=$(pwd)
local dir_work="$1" local dir_work="$1"
local branch="$2" local branch="$2"
[[ $branch ]] && local part_cmd="origin/${branch}"
cd $dir_work cd $dir_work
echo -e "开始更新仓库：$dir_work\n" echo -e "开始更新仓库：$dir_work\n"
set_proxy set_proxy
git fetch --all git fetch --all
exit_status=$? exit_status=$?
git reset --hard $part_cmd
git pull git pull
unset_proxy unset_proxy
@ -336,12 +336,16 @@ reset_romote_url() {
local url=$2 local url=$2
local branch="$3" local branch="$3"
[[ $branch ]] && local part_cmd="origin/${branch}"
if [[ -d "$dir_work/.git" ]]; then if [[ -d "$dir_work/.git" ]]; then
cd $dir_work cd $dir_work
[[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null [[ -f ".git/index.lock" ]] && rm -f .git/index.lock >/dev/null
git remote set-url origin $url &>/dev/null git remote set-url origin $url &>/dev/null
local part_cmd=""
if [[ $branch ]]; then
part_cmd="origin/${branch}"
git checkout -B "$branch"
fi
git reset --hard $part_cmd &>/dev/null git reset --hard $part_cmd &>/dev/null
cd $dir_current cd $dir_current
fi fi

4
shell/update.sh
View File

@ -246,7 +246,11 @@ update_qinglong() {
pnpm install -g pm2 &>/dev/null pnpm install -g pm2 &>/dev/null
local no_restart="$1" local no_restart="$1"
local all_branch=$(git branch -a)
local primary_branch="master" local primary_branch="master"
if [[ "${all_branch}" =~ "${current_branch}" ]]; then
primary_branch="${current_branch}"
fi
[[ -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} "https://github.com/whyour/qinglong.git" ${primary_branch} reset_romote_url ${dir_root} "https://github.com/whyour/qinglong.git" ${primary_branch}
git_pull_scripts $dir_root ${primary_branch} git_pull_scripts $dir_root ${primary_branch}