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 2021-10-16 19:32:23 +08:00
parent d12953a345
commit 51869b6a84
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/share.sh
View File

@ -274,9 +274,9 @@ git_clone_scripts() {
local url=$1 local url=$1
local dir=$2 local dir=$2
local branch=$3 local branch=$3
[[ $branch ]] && local cmd="-b $branch " [[ $branch ]] && local part_cmd="-b $branch "
echo -e "开始克隆仓库 $url 到 $dir\n" echo -e "开始克隆仓库 $url 到 $dir\n"
git clone $cmd $url $dir git clone $part_cmd $url $dir
exit_status=$? exit_status=$?
} }
@ -284,12 +284,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 cmd="origin/${branch}" [[ $branch ]] && local part_cmd="origin/${branch}"
cd $dir_work cd $dir_work
echo -e "开始更新仓库：$dir_work\n" echo -e "开始更新仓库：$dir_work\n"
git fetch --all git fetch --all
exit_status=$? exit_status=$?
git reset --hard $cmd git reset --hard $part_cmd
git pull git pull
cd $dir_current cd $dir_current
} }
@ -300,12 +300,12 @@ reset_romote_url() {
local url=$2 local url=$2
local branch="$3" local branch="$3"
[[ $branch ]] && local cmd="origin/${branch}" [[ $branch ]] && local part_cmd="origin/${branch}"
if [ -d "$dir_work/.git" ]; then if [ -d "$dir_work/.git" ]; then
cd $dir_work cd $dir_work
git remote set-url origin $url >/dev/null git remote set-url origin $url >/dev/null
git reset --hard $cmd >/dev/null git reset --hard $part_cmd >/dev/null
cd $dir_current cd $dir_current
fi fi
} }