diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d6b5bc2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Yukino + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index aae92de..2064cee 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,10 @@ - 脚本说明: Shadowsocks 一键安装脚本(四合一) - 系统支持: CentOS 6+,Debian 7+,Ubuntu 12+ -- 使用方法: https://teddysun.com/486.html ## 下载安装: ``` bash -wget --no-check-certificate -O shadowsocks-all.sh https://raw.githubusercontent.com/heweiye/teddysunBackup/shadowsocks_install/master/shadowsocks-all.sh +wget --no-check-certificate -O shadowsocks-all.sh https://raw.githubusercontent.com/Yuk1n0/Shadowsocks-Install/master/shadowsocks-all.sh chmod +x shadowsocks-all.sh ./shadowsocks-all.sh 2>&1 | tee shadowsocks-all.log ``` @@ -14,6 +13,9 @@ chmod +x shadowsocks-all.sh ``` bash ./shadowsocks-all.sh uninstall ``` + +各版本启动|停止|重启|状态命令 + Shadowsocks-Python 版: /etc/init.d/shadowsocks-python start | stop | restart | status @@ -27,6 +29,7 @@ Shadowsocks-libev 版: /etc/init.d/shadowsocks-libev start | stop | restart | status 各版本默认配置文件 + Shadowsocks-Python 版: /etc/shadowsocks-python/config.json diff --git a/shadowsocks-all.sh b/shadowsocks-all.sh index 90eb293..3cb7cbb 100644 --- a/shadowsocks-all.sh +++ b/shadowsocks-all.sh @@ -600,7 +600,7 @@ install_select(){ hint="${software[$i-1]}" echo -e "${green}${i}${plain}) ${hint}" done - read -p "Please enter a number (Default ${software[0]}):" selected + read -p "Please enter a number (Default ${software[3]}):" selected [ -z "${selected}" ] && selected="1" case "${selected}" in 1|2|3|4)