From 74f7c32e81029aa54daa39a812d7ce0dc3fd99be Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 27 Oct 2014 11:35:09 +0800
Subject: [PATCH 1/2] update readme, add oschina mirror.

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 1d7e9dfd1..0a19548de 100755
--- a/README.md
+++ b/README.md
@@ -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/>

From 2175102ea27fa581bd21fbefdd590e9a1b09b29f Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 27 Oct 2014 11:41:28 +0800
Subject: [PATCH 2/2] remove the sync script for mirror, which maybe updated.

---
 trunk/scripts/csdn.mirror.sh | 80 ------------------------------------
 1 file changed, 80 deletions(-)
 delete mode 100755 trunk/scripts/csdn.mirror.sh

diff --git a/trunk/scripts/csdn.mirror.sh b/trunk/scripts/csdn.mirror.sh
deleted file mode 100755
index 776e1e8c8..000000000
--- a/trunk/scripts/csdn.mirror.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/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