From 3dcbba38b390717cab1743a90636a71de1374d4c Mon Sep 17 00:00:00 2001 From: Yooona-Lim <81098819+Yooona-Lim@users.noreply.github.com> Date: Mon, 29 May 2023 21:29:59 +0800 Subject: [PATCH 1/4] Update status.sh and README.md --- README.md | 20 +++++----- status.sh | 116 ++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 110 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 1fbc658d..ca301410 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ - [2. 安装部署](#2-安装部署) - [2.1 快速体验](#21-快速体验) - [2.2 快速部署](#22-快速部署) - - [2.3 服务管理脚本部署，感谢 @Colsro 提供](#23-服务管理脚本部署感谢-colsro-提供) + - [2.3 服务管理脚本部署](#23-服务管理脚本部署) - [2.4 Railway 部署](#24-railway-部署) - [3. 服务端说明](#3-服务端说明) - [3.1 配置文件 `config.toml`](#31-配置文件-configtoml) @@ -125,9 +125,11 @@ bash -ex one-touch.sh 👉 [快速部署](https://doc.ssr.rs/rapid_deploy) -### 2.3 服务管理脚本部署，感谢 [@Colsro](https://github.com/Colsro) 提供 -
- 管理脚本使用说明 +### 2.3 服务管理脚本部署 + +[@Colsro](https://github.com/Colsro) 提供 + +[@Yooona-Lim](https://github.com/Yooona-Lim) 更新 ```bash # 下载脚本 @@ -152,6 +154,7 @@ help: -i -s 安装 Server -i -c 安装 Client -i -c conf 自动安装 Client + -up,--upgrade 升级 Status -u,--uninstall 卸载 Status -u -s 卸载 Server -u -c 卸载 Client @@ -159,15 +162,14 @@ help: -r 更改 Client 配置 -r conf 自动更改 Client配置 -s,--server 管理 Status 运行状态 - -s {start|stop|restart} + -s {status|start|stop|restart} -c,--client 管理 Client 运行状态 - -c {start|stop|restart} - -若无法访问 Github: + -c {status|start|stop|restart}n\ +若无法访问 Github: CN=true bash status.sh args + # 可能有点用 ``` -
### 2.4 Railway 部署 diff --git a/status.sh b/status.sh index 26345a1e..ba9de00e 100644 --- a/status.sh +++ b/status.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash #================================================= # Description: Serverstat-Rust -# Version: v1.0.0 +# Version: v1.0.1 +# Updater: Yooona-Lim #================================================= Info="\033[32m[信息]\033[0m" @@ -25,16 +26,20 @@ help:\n\ -i -s 安装 Server\n\ -i -c 安装 Client\n\ -i -c conf 自动安装 Client\n\ - -u,--uninstall 卸载 Status\n\ - -u -s 卸载 Server\n\ - -u -c 卸载 Client\n\ + -up,--upgrade 升级 Status\n\ + -up -s 升级 Server\n\ + -up -c 升级 Client\n\ + -up -a 升级 Server和Client + -un,--uninstall 卸载 Status\n\ + -un -s 卸载 Server\n\ + -un -c 卸载 Client\n\ -r,--reset 更改 Status 配置\n\ -r 更改 Client 配置\n\ -r conf 自动更改 Client配置\n\ -s,--server 管理 Status 运行状态\n\ - -s {start|stop|restart}\n\ + -s {status|start|stop|restart}\n\ -c,--client 管理 Client 运行状态\n\ - -c {start|stop|restart}\n\n\ + -c {status|start|stop|restart}\n\n\ 若无法访问 Github: \n\ CN=true bash status.sh args \n" @@ -78,6 +83,7 @@ function check_release() { check_release +#安装unzip和wget工具 function install_tool() { if [[ ${release} == "rpm" ]]; then yum -y install unzip wget @@ -160,12 +166,15 @@ EOF function ssserver() { INCMD="$1"; shift case ${INCMD} in - stop) - systemctl stop stat_server + status) # 新增状态检查命令 + systemctl status stat_server ;; start) systemctl start stat_server ;; + stop) + systemctl stop stat_server + ;; restart) systemctl restart stat_server ;; @@ -177,12 +186,15 @@ function ssserver() { function ssclient() { INCMD="$1"; shift case ${INCMD} in - stop) - systemctl stop stat_client + status) # 新增状态检查命令 + systemctl status stat_server ;; start) systemctl start stat_client ;; + stop) + systemctl stop stat_client + ;; restart) systemctl restart stat_client ;; @@ -228,20 +240,42 @@ function restart_client() { } -# 获取二进制文件 +# 获取二进制文件，现在可以选择下载server或者client，并添加文件下载校验 function get_status() { if [ "${CN}" = true ]; then - MIRROR="https://gh-proxy.com/" + MIRROR="https://gh-proxy.com/" fi install_tool rm -f ServerStatus-${arch}-unknown-linux-musl.zip stat_* cd /tmp || exit - wget "${MIRROR}https://github.com/zdz/Serverstatus-Rust/releases/latest/download/server-${arch}-unknown-linux-musl.zip" - wget "${MIRROR}https://github.com/zdz/Serverstatus-Rust/releases/latest/download/client-${arch}-unknown-linux-musl.zip" - unzip -o server-${arch}-unknown-linux-musl.zip - unzip -o client-${arch}-unknown-linux-musl.zip + + # 判断为空或者 "-a" "--all"，为空可以兼容前面的函数功能 + if [ -z "$1" ] || [ "$1" = "-a" ] || [ "$1" = "--all" ]; then + wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/server-${arch}-unknown-linux-musl.zip" + wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/client-${arch}-unknown-linux-musl.zip" + unzip -o server-${arch}-unknown-linux-musl.zip + unzip -o client-${arch}-unknown-linux-musl.zip + elif [ "$1" = "-s" ] || [ "$1" = "--server" ]; then + wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/server-${arch}-unknown-linux-musl.zip" + unzip -o server-${arch}-unknown-linux-musl.zip + elif [ "$1" = "-c" ] || [ "$1" = "--client" ]; then + wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/client-${arch}-unknown-linux-musl.zip" + unzip -o client-${arch}-unknown-linux-musl.zip + else + echo "无效的参数" + exit 1 + fi + + # 验证文件是否成功解压 + if [ $? -eq 0 ]; then + echo "文件下载和解压成功！" + else + echo "文件下载或解压失败！" + exit 1 + fi } + # 安装服务 function install_server() { echo -e "${Info} 下载 ${arch} 二进制文件" @@ -333,6 +367,51 @@ function ssuninstall() { esac } +# 升级版本 +function ssupgrade() { + INCMD="$1"; shift + case ${INCMD} in + --server|-s) + echo -e "${Info} 开始升级 Server" + systemctl stop stat_server + echo -e "${Info} 获取二进制文件" + get_status + mv /tmp/stat_server /usr/local/ServerStatus/server/stat_server + chmod +x /usr/local/ServerStatus/server/stat_server + systemctl start stat_server + ;; + --client|-c) + echo -e "${Info} 开始升级 Client" + systemctl stop stat_client + echo -e "${Info} 获取二进制文件" + get_status + mv /tmp/stat_client /usr/local/ServerStatus/client/stat_client + chmod +x /usr/local/ServerStatus/client/stat_client + systemctl start stat_client + ;; + --all|-a) + echo -e "${Info} 开始升级版本" + systemctl stop stat_server + systemctl stop stat_client + + echo -e "${Info} 获取二进制文件" + get_status #以防有/tem目录的旧版本，直接重新下载 + mv /tmp/stat_server /usr/local/ServerStatus/server/stat_server + chmod +x /usr/local/ServerStatus/server/stat_server + + mv /tmp/stat_client /usr/local/ServerStatus/client/stat_client + chmod +x /usr/local/ServerStatus/client/stat_client + + systemctl start stat_server + systemctl start stat_client + + echo -e "${Info} 版本升级完成" + *) + sshelp + ;; + esac +} + if [ ! "$#" = 0 ]; then INCMD="$1"; shift fi @@ -341,7 +420,10 @@ case ${INCMD} in --install|-i) ssinstall "$@" ;; - --uninstall|-uni|-u) + --upgrade|-up) + ssupgrade "$@" + ;; + --uninstall|-un) ssuninstall "$@" ;; --reset|-r) From 3eeddaea6f6414b97c8b01de974b99071085146a Mon Sep 17 00:00:00 2001 From: Yooona-Lim <81098819+Yooona-Lim@users.noreply.github.com> Date: Mon, 29 May 2023 21:33:57 +0800 Subject: [PATCH 2/4] Update README.md --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ca301410..d142b918 100644 --- a/README.md +++ b/README.md @@ -155,16 +155,19 @@ help: -i -c 安装 Client -i -c conf 自动安装 Client -up,--upgrade 升级 Status - -u,--uninstall 卸载 Status - -u -s 卸载 Server - -u -c 卸载 Client + -up -s 升级 Server + -up -c 升级 Client + -up -a 升级 Server和Client + -un,--uninstall 卸载 Status + -un -s 卸载 Server + -un -c 卸载 Client -r,--reset 更改 Status 配置 -r 更改 Client 配置 -r conf 自动更改 Client配置 -s,--server 管理 Status 运行状态 -s {status|start|stop|restart} -c,--client 管理 Client 运行状态 - -c {status|start|stop|restart}n\ + -c {status|start|stop|restart} 若无法访问 Github: CN=true bash status.sh args From af0599a456514548c9e7178bdf5509fc7cfa5a4a Mon Sep 17 00:00:00 2001 From: Yooona-Lim <81098819+Yooona-Lim@users.noreply.github.com> Date: Mon, 29 May 2023 21:54:34 +0800 Subject: [PATCH 3/4] Correcting errors in status.sh --- status.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/status.sh b/status.sh index ba9de00e..e51c0998 100644 --- a/status.sh +++ b/status.sh @@ -406,6 +406,7 @@ function ssupgrade() { systemctl start stat_client echo -e "${Info} 版本升级完成" + ;; *) sshelp ;; From 4ad3e0669fccd32f40dd09c4f7b8ee979e154ede Mon Sep 17 00:00:00 2001 From: Yooona-Lim <81098819+Yooona-Lim@users.noreply.github.com> Date: Mon, 29 May 2023 22:02:38 +0800 Subject: [PATCH 4/4] Correcting errors in status.sh --- status.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/status.sh b/status.sh index e51c0998..92ec4929 100644 --- a/status.sh +++ b/status.sh @@ -251,15 +251,15 @@ function get_status() { # 判断为空或者 "-a" "--all"，为空可以兼容前面的函数功能 if [ -z "$1" ] || [ "$1" = "-a" ] || [ "$1" = "--all" ]; then - wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/server-${arch}-unknown-linux-musl.zip" - wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/client-${arch}-unknown-linux-musl.zip" + wget "${MIRROR}https://github.com/zdz/Serverstatus-Rust/releases/latest/download/server-${arch}-unknown-linux-musl.zip" + wget "${MIRROR}https://github.com/zdz/Serverstatus-Rust/releases/latest/download/client-${arch}-unknown-linux-musl.zip" unzip -o server-${arch}-unknown-linux-musl.zip unzip -o client-${arch}-unknown-linux-musl.zip elif [ "$1" = "-s" ] || [ "$1" = "--server" ]; then - wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/server-${arch}-unknown-linux-musl.zip" + wget "${MIRROR}https://github.com/zdz/Serverstatus-Rust/releases/latest/download/server-${arch}-unknown-linux-musl.zip" unzip -o server-${arch}-unknown-linux-musl.zip elif [ "$1" = "-c" ] || [ "$1" = "--client" ]; then - wget "$MIRRORhttps://github.com/zdz/Serverstatus-Rust/releases/latest/download/client-${arch}-unknown-linux-musl.zip" + wget "${MIRROR}https://github.com/zdz/Serverstatus-Rust/releases/latest/download/client-${arch}-unknown-linux-musl.zip" unzip -o client-${arch}-unknown-linux-musl.zip else echo "无效的参数"