From f9f2f48eeaee9cfa6be25dc0595968bc829d265e Mon Sep 17 00:00:00 2001 From: zhangjie Date: Wed, 25 Mar 2026 18:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/docker-build.yml | 2 +- data/servctl.sh | 38 +++++++++++++++++++------------ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 5ba061b..3d1bfd1 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -7,7 +7,7 @@ env: DOCKER_REGISTRY: ${{ vars.DOCKER_REGISTRY }} DOCKER_NAMESPACE: zhangjie DOCKER_IMAGE: servboard - DOCKER_TAG: V1.0.0 + DOCKER_TAG: v1.0.1 on: push: diff --git a/data/servctl.sh b/data/servctl.sh index 63a29a1..4d963b6 100644 --- a/data/servctl.sh +++ b/data/servctl.sh @@ -1,16 +1,24 @@ #!/bin/bash # servctl.sh - ServBoard services 管理工具 -# 数据库路径 -DB_PATH="$(dirname "$0")/dashboard.db" -# 检查依赖 -if ! command -v sqlite3 &> /dev/null; then - echo "错误: 未安装 sqlite3" >&2 +# 获取脚本所在目录的绝对路径(更可靠的方法) +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +DB_PATH="$SCRIPT_DIR/dashboard.db" + +# 检查依赖并获取 sqlite3 路径 +SQLITE3_PATH=$(which sqlite3 2>/dev/null) +if [ -z "$SQLITE3_PATH" ]; then + echo "错误: 未找到 sqlite3 命令行工具" >&2 + echo "请安装 sqlite3: apt-get install sqlite3 (Debian/Ubuntu) 或 yum install sqlite (CentOS/RHEL)" >&2 + echo "当前 PATH: $PATH" >&2 exit 1 fi +echo "使用 sqlite3 路径: $SQLITE3_PATH" + if [ ! -f "$DB_PATH" ]; then echo "错误: 数据库文件不存在: $DB_PATH" >&2 + echo "请确保数据库文件存在或先运行应用程序创建数据库" >&2 exit 1 fi @@ -34,7 +42,7 @@ EOF } list_services() { - sqlite3 -header -column "$DB_PATH" \ + "$SQLITE3_PATH" -header -column "$DB_PATH" \ "SELECT id, name, description, port, protocol, enabled, IFNULL(icon, '') AS icon, IFNULL(path, '') AS path FROM services ORDER BY id;" } @@ -52,8 +60,8 @@ add_service_from_args() { ICON="${5:-}" PATH="${6:-}" - # 清理端口空白 - PORT=$(echo "$PORT" | tr -d '[:space:]') + # 清理端口空白(使用bash内置功能) + PORT="${PORT// /}" # 校验端口 if ! [[ "$PORT" =~ ^[0-9]+$ ]] || [ "$PORT" -lt 1 ] || [ "$PORT" -gt 65535 ]; then @@ -61,8 +69,8 @@ add_service_from_args() { exit 1 fi - # 校验协议 - PROTO=$(echo "$PROTO_RAW" | tr '[:upper:]' '[:lower:]') + # 校验协议(使用bash内置功能转换为小写) + PROTO="${PROTO_RAW,,}" if [ "$PROTO" != "http" ] && [ "$PROTO" != "https" ]; then echo "错误: protocol 必须是 http 或 https(当前输入: '$PROTO_RAW')" >&2 exit 1 @@ -79,7 +87,7 @@ add_service_from_args() { SQL="INSERT INTO services (name, description, port, protocol, enabled) VALUES ('$NAME', '$DESC', $PORT, '$PROTO', $ENABLED);" fi - if sqlite3 "$DB_PATH" "$SQL"; then + if "$SQLITE3_PATH" "$DB_PATH" "$SQL"; then echo "✅ 添加成功: $NAME ($PORT/$PROTO)" if [ -n "$PATH" ]; then echo " 路径: $PATH" @@ -96,12 +104,12 @@ delete_service() { exit 1 fi NAME="$1" - COUNT=$(sqlite3 "$DB_PATH" "SELECT COUNT(*) FROM services WHERE name = '$NAME';") + COUNT=$($SQLITE3_PATH "$DB_PATH" "SELECT COUNT(*) FROM services WHERE name = '$NAME';") if [ "$COUNT" -eq 0 ]; then echo "⚠️ 未找到服务: $NAME" >&2 exit 1 fi - sqlite3 "$DB_PATH" "DELETE FROM services WHERE name = '$NAME';" + "$SQLITE3_PATH" "$DB_PATH" "DELETE FROM services WHERE name = '$NAME';" echo "🗑️ 已删除: $NAME" } @@ -111,13 +119,13 @@ toggle_service() { exit 1 fi NAME="$1" - CURRENT=$(sqlite3 "$DB_PATH" "SELECT enabled FROM services WHERE name = '$NAME';") + CURRENT=$($SQLITE3_PATH "$DB_PATH" "SELECT enabled FROM services WHERE name = '$NAME';") if [ -z "$CURRENT" ]; then echo "⚠️ 未找到服务: $NAME" >&2 exit 1 fi NEW_STATE=$((1 - CURRENT)) - sqlite3 "$DB_PATH" "UPDATE services SET enabled = $NEW_STATE WHERE name = '$NAME';" + "$SQLITE3_PATH" "$DB_PATH" "UPDATE services SET enabled = $NEW_STATE WHERE name = '$NAME';" if [ "$NEW_STATE" -eq 1 ]; then echo "🔌 已启用: $NAME" else