Optimization code

loyess · Jul 1, 2020 · ee1bb79 · ee1bb79
1 parent a271ee8
commit ee1bb79
Show file tree

Hide file tree

Showing 6 changed files with 1,054 additions and 1,000 deletions.
diff --git a/README.md b/README.md
@@ -10,88 +10,87 @@ chmod +x ss-plugins.sh
 &nbsp;
 
 ```shell
-Usage: ./ss-plugins.sh [options...] [args...]
-
- 选项<options>包括:
- install 安装
- uninstall 卸载
- update 升级
- start 启动
- stop 关闭
- restart 重启
- status 查看状态
- script 升级脚本
- show 显示可视化配置
- log 查看日志文件
- cert 手动申请.cf .ga .gq .ml .tk域名CF CDN证书(有效期3个月)
- uid 为cloak添加一个新的uid用户
- link 用新添加的uid生成一个新的SS:https://链接
- scan 用ss:https://链接在当前终端上生成一个可供扫描的二维码
- help 打印帮助信息并退出
+Usage:
+ ./ss-plugins.sh [options...] [args...]
 
- [注意] uid和link选项仅在搭配安装cloak的情况下使用.
+Available Options:
+ install 安装
+ uninstall 卸载
+ update 升级
+ start 启动
+ stop 关闭
+ restart 重启
+ status 查看状态
+ script 升级脚本
+ show 显示可视化配置
+ log 查看日志文件
+ cert 手动申请Cloudflare CDN证书(仅 .cf .ga .gq .ml .tk，有效期90天)
+ uid 为cloak添加一个新的uid用户(仅 Cloak)
+ link 用新添加的uid生成一个新的SS:https://链接(仅 Cloak)
+ scan 用ss:https://链接在当前终端上生成一个可供扫描的二维码
+ help 打印帮助信息并退出
 ```
 
 &nbsp;
 
 ```shell
 相关目录：
 
-  SS-libev安装目录：/usr/local/bin
-  SS-libev启动文件：/etc/init.d/shadowsocks-libev
-  SS-libev配置文件：/etc/shadowsocks/config.json
+ SS-libev安装目录：/usr/local/bin
+ SS-libev启动文件：/etc/init.d/shadowsocks-libev
+ SS-libev配置文件：/etc/shadowsocks/config.json
 
-  SS-rust安装目录：/usr/local/bin
-  SS-rust启动文件：/etc/init.d/shadowsocks-rust
-  SS-rust配置文件：/etc/shadowsocks/config.json
+ SS-rust安装目录：/usr/local/bin
+ SS-rust启动文件：/etc/init.d/shadowsocks-rust
+ SS-rust配置文件：/etc/shadowsocks/config.json
 
-  Go-ss2安装目录：/usr/local/bin
-  Go-ss2启动文件：/etc/init.d/go-shadowsocks2
-  Go-ss2配置文件：/etc/shadowsocks/config.json
+ Go-ss2安装目录：/usr/local/bin
+ Go-ss2启动文件：/etc/init.d/go-shadowsocks2
+ Go-ss2配置文件：/etc/shadowsocks/config.json
 
-  kcptun安装目录：/usr/local/kcptun
-  kcptun启动文件：/etc/init.d/kcptun
-  kcptun配置文件：/etc/kcptun/config.json
+ kcptun安装目录：/usr/local/kcptun
+ kcptun启动文件：/etc/init.d/kcptun
+ kcptun配置文件：/etc/kcptun/config.json
 
-  cloak安装目录：/usr/local/bin
-  cloak启动文件：/etc/init.d/cloak
-  cloak配置文件：/etc/cloak/ckserver.json
-
-  rabbit-tcp安装目录：/usr/local/bin
-  rabbit-tcp启动文件：/etc/init.d/rabbit-tcp
-  rabbit-tcp配置文件：/etc/rabbit-tcp/config.json
-
-  caddy安装目录：/usr/local/caddy
-  caddy配置文件: /usr/local/caddy/Caddyfile
-  caddy生成证书目录：~/.caddy/acme/acme-v02.api.letsencrypt.org/sites/xxx.xxx(域名)/
- 
-  nginx二进制文件：/usr/sbin/nginx
-  nginx配置文件：/etc/nginx/nginx.conf
-
-  SS-libev日志文件：/var/log/shadowsocks-libev.log
-  SS-rust日志文件：/var/log/shadowsocks-rust.log
-  Go-ss2日志文件：/var/log/go-shadowsocks2.log
-  kcptun日志文件：/var/log/kcptun.log
-  cloak日志文件：/var/log/cloak.log
-  rabbit-tcp日志文件：/var/log/rabbit-tcp.log
-  caddy错误日志文件：/var/log/caddy-error.log
-  caddy访问日志文件：/var/log/caddy-access.log
-  nginx错误日志文件：/var/log/nginx-error.log
-  nginx访问日志文件：/var/log/nginx-access.log
-
-  acme.sh安装目录：~/.acme.sh
-  acme.sh生成证书目录：~/.acme.sh/xxx.xxx(域名)/
- 
-  cloudflare API存储路径：~/.api/cf.api
-  其它插件可执行二进制文件目录：/usr/local/bin
+ cloak安装目录：/usr/local/bin
+ cloak启动文件：/etc/init.d/cloak
+ cloak配置文件：/etc/cloak/ckserver.json
+
+ rabbit-tcp安装目录：/usr/local/bin
+ rabbit-tcp启动文件：/etc/init.d/rabbit-tcp
+ rabbit-tcp配置文件：/etc/rabbit-tcp/config.json
+
+ caddy安装目录：/usr/local/caddy
+ caddy配置文件: /usr/local/caddy/Caddyfile
+ caddy生成证书目录：~/.caddy/acme/acme-v02.api.letsencrypt.org/sites/xxx.xxx(域名)/
+
+ nginx二进制文件：/usr/sbin/nginx
+ nginx配置文件：/etc/nginx/nginx.conf
+
+ SS-libev日志文件：/var/log/shadowsocks-libev.log
+ SS-rust日志文件：/var/log/shadowsocks-rust.log
+ Go-ss2日志文件：/var/log/go-shadowsocks2.log
+ kcptun日志文件：/var/log/kcptun.log
+ cloak日志文件：/var/log/cloak.log
+ rabbit-tcp日志文件：/var/log/rabbit-tcp.log
+ caddy错误日志文件：/var/log/caddy-error.log
+ caddy访问日志文件：/var/log/caddy-access.log
+ nginx错误日志文件：/var/log/nginx-error.log
+ nginx访问日志文件：/var/log/nginx-access.log
+
+ acme.sh安装目录：~/.acme.sh
+ acme.sh生成证书目录：~/.acme.sh/xxx.xxx(域名)/
+
+ cloudflare API存储路径：~/.api/cf.api
+ 其它插件可执行二进制文件目录：/usr/local/bin
 ```
 
 &nbsp;
 
 1. ### 主菜单
 
 ```shell
-  Shadowsocks-libev一键管理脚本 [v1.0.0]
+ Shadowsocks-libev一键管理脚本 [v1.0.0]
 
  1. BBR
  2. Install
@@ -108,20 +107,20 @@ Usage: ./ss-plugins.sh [options...] [args...]
 
 ~~~shell
  1. v2ray-plugin
-  1. ws+http
-  2. ws+tls+[cdn]
-  3. quic+tls+[cdn]
-  4. ws+tls+web
-  5. ws+tls+web+cdn
+ 1. ws+http
+ 2. ws+tls+[cdn]
+ 3. quic+tls+[cdn]
+ 4. ws+tls+web
+ 5. ws+tls+web+cdn
  2. kcptun
  3. simple-obfs
-  1. http
-  2. tls
+ 1. http
+ 2. tls
  4. goquiet (unofficial)
  5. cloak (based goquiet)
  6. mos-tls-tunnel
-  1. tls
-  2. wss
+ 1. tls
+ 2. wss
  7. rabbit-tcp
  8. simple-tls
 
@@ -200,6 +199,7 @@ Usage: ./ss-plugins.sh [options...] [args...]
 - [shadowsocks-windows](<https://github.com/shadowsocks/shadowsocks-windows/releases>)
 - [shadowsocks-android](<https://github.com/shadowsocks/shadowsocks-android/releases>)
 - [v2ray-plugin](<https://github.com/shadowsocks/v2ray-plugin/releases>)
+- [v2ray-plugin (teddysun)](<https://github.com/teddysun/v2ray-plugin/releases>)
 - [v2ray-plugin-android](<https://github.com/shadowsocks/v2ray-plugin-android/releases>)
 - [kcptun](https://github.com/xtaci/kcptun/releases)
 - [kcptun-android](https://github.com/shadowsocks/kcptun-android/releases)

diff --git a/format_converter.sh b/format_converter.sh
@@ -8,6 +8,8 @@ dos2unix ./ss-plugins.sh
 
 dos2unix ./utils/ck_sslink.sh
 dos2unix ./utils/ck_user_manager.sh
+dos2unix ./utils/common.sh
+dos2unix ./utils/constants.sh
 dos2unix ./utils/gen_certificates.sh
 dos2unix ./utils/qr_code.sh
 dos2unix ./utils/view_config.sh

diff --git a/prepare/goquiet_prepare.sh b/prepare/goquiet_prepare.sh
@@ -64,7 +64,6 @@ get_input_webaddr_of_domain(){
 get_input_gqkey(){
  echo
  echo -e "请为GoQuiet输入密钥 [留空以将其设置为16位随机字符串]"
- echo
  read -e -p "(默认: ${ran_str16}):" gqkey
  [ -z "$gqkey" ] && gqkey=${ran_str16}
  echo