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:55:05 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
d004c30ef39dea3fe77d0d7083288f2d9a6ec93c
d004c30e
2 parents
2f1a792c
2175102e
Merge branch 'srs.1.0release' into 1.0release
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
6 行增加
和
80 行删除
README.md
trunk/scripts/csdn.mirror.sh
README.md
查看文件 @
d004c30
...
...
@@ -22,6 +22,12 @@ git clone https://github.com/winlinvip/simple-rtmp-server.git
git clone https://code.csdn.net/winlinvip/srs-csdn.git
```
获得源码(国内OSChina镜像):
[
http://git.oschina.net/winlinvip/srs.oschina
](
http://git.oschina.net/winlinvip/srs.oschina
)
[
GIT使用方法
]
(https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_Git)
```
bash
git clone https://git.oschina.net/winlinvip/srs.oschina.git
```
报告问题(BugReport):
[
https://github.com/winlinvip/simple-rtmp-server/issues/new
](
https://github.com/winlinvip/simple-rtmp-server/issues/new
)
<br/>
中文资料(Wiki):
[
https://github.com/winlinvip/simple-rtmp-server/wiki
](
https://github.com/winlinvip/simple-rtmp-server/wiki
)
<br/>
使用步骤(Usage):
[
https://github.com/winlinvip/simple-rtmp-server#usage
](
#usage
)
<br/>
...
...
trunk/scripts/csdn.mirror.sh
已删除
100755 → 0
查看文件 @
2f1a792
#!/bin/bash
echo
"更新CSDN镜像的脚本"
# 创建CSDN镜像的过程如下:
# 1. 在CSDN上创建项目,从https://github.com/winlinvip/simple-rtmp-server拷贝过来。
# 2. 在本地虚拟机上:
# git clone git@code.csdn.net:winlinvip/srs-csdn.git
# 3. 创建同步的branch:
# git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git
# git fetch upstream
# git checkout upstream/master -b srs.master
# 4. 执行本同步更新脚本,更新。
# bash scripts/csdn.mirror.sh
echo
"argv[0]=
$0
"
if
[[
! -f
$0
]]
;
then
echo
"directly execute the scripts on shell."
;
work_dir
=
`
pwd
`
else
echo
"execute scripts in file:
$0
"
;
work_dir
=
`
dirname
$0
`
;
work_dir
=
`
(
cd
${
work_dir
}
&&
pwd
)
`
fi
work_dir
=
`
(
cd
${
work_dir
}
/..
&&
pwd
)
`
product_dir
=
$work_dir
# allow start script from any dir
cd
$work_dir
.
${
product_dir
}
/scripts/_log.sh
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
exit
$ret
;
fi
ok_msg
"导入脚本成功"
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
3. 创建同步的branch:
git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git
git fetch upstream
git checkout upstream/master -b srs.master
4. 执行本同步更新脚本,更新。
bash scripts/csdn.mirror.sh
END
exit
0;
fi
for
((
;;
))
;
do
git checkout srs.master
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"更新github分支失败,自动重试"
;
continue
else
ok_msg
"更新github分支成功"
fi
break
done
git checkout master
&&
git merge srs.master
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"合并github分支成功"
for
((
;;
))
;
do
git push
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"提交CSDN分支失败,自动重试"
;
continue
else
ok_msg
"提交CSDN分支成功"
fi
break
done
ok_msg
"CSDN同步git成功"
exit
0
请
注册
或
登录
后发表评论