diff --git a/README.md b/README.md index f626f32..37a2891 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ proxy是golang实现的高性能http,https,websocket,tcp代理服务器.程序 提示:所有操作需要root权限. 0.如果你的VPS是linux64位的系统,那么只需要执行下面一句,就可以完成自动安装和配置. -#wget https://github.com/snail007/goproxy/blob/master/install_auto.sh -O - | sh +#curl -L https://raw.githubusercontent.com/snail007/goproxy/master/install_auto.sh | bash 安装完成,配置目录是/etc/proxy,更详细的使用方法参考下面的进一步了解. 如果你的vps不是linux64位系统,请按照下面的半自动步骤安装: @@ -59,4 +59,3 @@ proxy是golang实现的高性能http,https,websocket,tcp代理服务器.程序 然后程序即可通过加密通道通过vps上网。 任何使用问题欢迎邮件交流:arraykeys@gmail.com - diff --git a/install.sh b/install.sh index 61e59f7..f11ccc3 100755 --- a/install.sh +++ b/install.sh @@ -1,13 +1,18 @@ #!/bin/bash +set -e +if [ -e /tmp/proxy ]; then + rm -rf /tmp/proxy +fi +mkdir /tmp/proxy +cd /tmp/proxy # install monexec -tar zxvf monexec_*.tar.gz -cd monexec_* +tar zxvf monexec_0.1.1_linux_amd64.tar.gz +cd monexec_0.1.1_linux_amd64 cp monexec /usr/bin/ chmod +x /usr/bin/monexec - +cd .. # #install proxy -tar zxvf proxy-*.tar.gz -cd proxy-* +tar zxvf proxy-linux-amd64.tar.gz cp proxy /usr/bin/ cp proxyd /usr/bin/ chmod +x /usr/bin/proxy @@ -21,16 +26,6 @@ if [ ! -e /etc/proxy/proxy.crt ]; then cd /etc/proxy/ proxy keygen >/dev/null 2>&1 fi - -if [ ! -e /etc/proxy/blocked ]; then - cd /etc/proxy/ - cp blocked /etc/proxy/ -fi - -if [ ! -e /etc/proxy/direct ]; then - cd /etc/proxy/ - cp direct /etc/proxy/ -fii - +rm -rf /tmp/proxy echo "install done" -proxyd \ No newline at end of file +proxyd diff --git a/install_auto.sh b/install_auto.sh index 083c97e..48a5647 100755 --- a/install_auto.sh +++ b/install_auto.sh @@ -1,20 +1,21 @@ #!/bin/bash - -rm -rf /tmp/proxy +set -e +if [ -e /tmp/proxy ]; then + rm -rf /tmp/proxy +fi mkdir /tmp/proxy cd /tmp/proxy wget https://github.com/reddec/monexec/releases/download/v0.1.1/monexec_0.1.1_linux_amd64.tar.gz -wget https://github.com/snail007/goproxy/blob/master/release-2.0/proxy-linux-amd64.tar.gz +wget https://github.com/snail007/goproxy/releases/download/v2.1/proxy-linux-amd64.tar.gz # install monexec -tar zxvf monexec_*.tar.gz -cd monexec_* +tar zxvf monexec_0.1.1_linux_amd64.tar.gz +cd monexec_0.1.1_linux_amd64 cp monexec /usr/bin/ chmod +x /usr/bin/monexec - +cd .. # #install proxy -tar zxvf proxy-*.tar.gz -cd proxy-* +tar zxvf proxy-linux-amd64.tar.gz cp proxy /usr/bin/ cp proxyd /usr/bin/ chmod +x /usr/bin/proxy @@ -28,5 +29,6 @@ if [ ! -e /etc/proxy/proxy.crt ]; then cd /etc/proxy/ proxy keygen >/dev/null 2>&1 fi +rm -rf /tmp/proxy echo "install done" -proxyd \ No newline at end of file +proxyd