Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-10-27 12:03:56 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
60ab365660434ed00f194b3749f5eb4a3cd170d0
60ab3656
1 parent
e104a187
update mirror, use utils functions.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
110 行增加
和
136 行删除
trunk/scripts/_mirror.utils.sh
trunk/scripts/csdn.mirror.sh
trunk/scripts/oschina.mirror.sh
trunk/scripts/_mirror.utils.sh
0 → 100755
查看文件 @
60ab365
#!/bin/bash
#############################################
# help for the first checkout.
#############################################
function
first_checkout
()
{
mirror_name
=
$1
git_url
=
$2
project_dir
=
$3
sync_script
=
$4
failed_msg
"当前分支不是
${
mirror_name
}
镜像"
;
cat
<<END
创建${mirror_name}镜像的过程如下:
1. 在${mirror_name}上创建项目,
可创建空项目,或从https://github.com/winlinvip/simple-rtmp-server拷贝过来。
2. 在本地虚拟机上:
git clone $git_url
cd $project_dir && git checkout master && git branch 1.0release && git push origin 1.0release
3. 创建同步的branch:
git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git
git fetch upstream
git checkout upstream/master -b srs.master
git checkout upstream/1.0release -b srs.1.0release
4. 执行本同步更新脚本,更新。
bash $sync_script
END
}
#############################################
# branch master
#############################################
function
sync_master
()
{
for
((
;;
))
;
do
git checkout srs.master
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(master)更新github分支失败,自动重试"
;
continue
else
ok_msg
"(master)更新github分支成功"
fi
break
done
git checkout master
&&
git merge srs.master
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(master)合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"(master)合并github分支成功"
}
#############################################
# branch 1.0release
#############################################
function
sync_1_0_release
()
{
for
((
;;
))
;
do
git checkout srs.1.0release
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)更新github分支失败,自动重试"
;
continue
else
ok_msg
"(1.0release)更新github分支成功"
fi
break
done
git checkout 1.0release
&&
git merge srs.1.0release
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"(1.0release)合并github分支成功"
}
#############################################
# push
#############################################
function
sync_push
()
{
mirror_name
=
$1
for
((
;;
))
;
do
git push
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"提交
${
mirror_name
}
分支失败,自动重试"
;
continue
else
ok_msg
"提交
${
mirror_name
}
分支成功"
fi
break
done
git checkout master
ok_msg
"
${
mirror_name
}
同步git成功"
}
...
...
trunk/scripts/csdn.mirror.sh
查看文件 @
60ab365
...
...
@@ -20,78 +20,18 @@ cd $work_dir
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
exit
$ret
;
fi
ok_msg
"导入脚本成功"
source
$work_dir
/scripts/_mirror.utils.sh
git remote -v|grep code.csdn.net >/dev/null 2>&1
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"当前分支不是CSDN镜像"
;
cat
<<END
创建CSDN镜像的过程如下:
1. 在CSDN上创建项目,从https://github.com/winlinvip/simple-rtmp-server拷贝过来。
2. 在本地虚拟机上:
git clone git@code.csdn.net:winlinvip/srs-csdn.git
cd srs-csdn && git checkout master && git branch 1.0release && git push origin 1.0release
3. 创建同步的branch:
git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git
git fetch upstream
git checkout upstream/master -b srs.master
git checkout upstream/1.0release -b srs.1.0release
4. 执行本同步更新脚本,更新。
bash scripts/csdn.mirror.sh
END
first_checkout
"CSDN"
\
"git@code.csdn.net:winlinvip/srs-csdn.git"
\
"srs-csdn"
"
$work_dir
/scripts/csdn.mirror.sh"
exit
0;
fi
#############################################
# branch master
#############################################
for
((
;;
))
;
do
git checkout srs.master
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(master)更新github分支失败,自动重试"
;
continue
else
ok_msg
"(master)更新github分支成功"
fi
break
done
git checkout master
&&
git merge srs.master
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(master)合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"(master)合并github分支成功"
#############################################
# branch 1.0release
#############################################
for
((
;;
))
;
do
git checkout srs.1.0release
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)更新github分支失败,自动重试"
;
continue
else
ok_msg
"(1.0release)更新github分支成功"
fi
break
done
git checkout 1.0release
&&
git merge srs.1.0release
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"(1.0release)合并github分支成功"
#############################################
# push
#############################################
for
((
;;
))
;
do
git push
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"提交CSDN分支失败,自动重试"
;
continue
else
ok_msg
"提交CSDN分支成功"
fi
break
done
git checkout master
ok_msg
"CSDN同步git成功"
sync_master
sync_1_0_release
sync_push
"CSDN"
exit
0
...
...
trunk/scripts/oschina.mirror.sh
查看文件 @
60ab365
...
...
@@ -20,78 +20,18 @@ cd $work_dir
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
exit
$ret
;
fi
ok_msg
"导入脚本成功"
source
$work_dir
/scripts/_mirror.utils.sh
git remote -v|grep git.oschina.net >/dev/null 2>&1
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"当前分支不是OSChina镜像"
;
cat
<<END
创建OSChina镜像的过程如下:
1. 在OSChina上创建项目,从https://github.com/winlinvip/simple-rtmp-server拷贝过来。
2. 在本地虚拟机上:
git clone git@git.oschina.net:winlinvip/srs.oschina.git
cd srs.oschina && git checkout master && git branch 1.0release && git push origin 1.0release
3. 创建同步的branch:
git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git
git fetch upstream
git checkout upstream/master -b srs.master
git checkout upstream/1.0release -b srs.1.0release
4. 执行本同步更新脚本,更新。
bash scripts/oschina.mirror.sh
END
first_checkout
"OSChina"
\
"git@git.oschina.net:winlinvip/srs.oschina.git"
\
"srs.oschina"
"
$work_dir
/scripts/oschina.mirror.sh"
exit
0;
fi
#############################################
# branch master
#############################################
for
((
;;
))
;
do
git checkout srs.master
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(master)更新github分支失败,自动重试"
;
continue
else
ok_msg
"(master)更新github分支成功"
fi
break
done
git checkout master
&&
git merge srs.master
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(master)合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"(master)合并github分支成功"
#############################################
# branch 1.0release
#############################################
for
((
;;
))
;
do
git checkout srs.1.0release
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)更新github分支失败,自动重试"
;
continue
else
ok_msg
"(1.0release)更新github分支成功"
fi
break
done
git checkout 1.0release
&&
git merge srs.1.0release
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"(1.0release)合并github分支成功"
#############################################
# push
#############################################
for
((
;;
))
;
do
git push
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"提交OSChina分支失败,自动重试"
;
continue
else
ok_msg
"提交OSChina分支成功"
fi
break
done
git checkout master
ok_msg
"OSChina同步git成功"
sync_master
sync_1_0_release
sync_push
"OSChina"
exit
0
...
...
请
注册
或
登录
后发表评论