✨ feat(drosync): add clean installation script and stale session cleanup to linux installer

This commit is contained in:
eust-w 2026-09-22 20:13:36 +08:00
parent 8fb87fc356
commit 8846ec3e7d
3 changed files with 219 additions and 4 deletions

View File

@ -49,9 +49,10 @@ cp "$ROOT_DIR/packaging/linux/drosync.service" "$PACKAGE_ROOT/drosync.service"
cp "$ROOT_DIR/packaging/linux/drosync-user.service" "$PACKAGE_ROOT/drosync-user.service"
cp "$ROOT_DIR/packaging/linux/drosync-portable.service" "$PACKAGE_ROOT/drosync-portable.service"
cp "$ROOT_DIR/packaging/linux/install-systemd-portable.sh" "$PACKAGE_ROOT/install-systemd-portable.sh"
cp "$ROOT_DIR/packaging/linux/clean-install.sh" "$PACKAGE_ROOT/clean-install.sh"
cp "$ROOT_DIR/packaging/linux/uninstall-systemd-portable.sh" "$PACKAGE_ROOT/uninstall-systemd-portable.sh"
cp "$ROOT_DIR/packaging/linux/PORTABLE-SYSTEMD-README.md" "$PACKAGE_ROOT/README-systemd-portable.md"
chmod 0755 "$PACKAGE_ROOT/install-systemd-portable.sh" "$PACKAGE_ROOT/uninstall-systemd-portable.sh"
chmod 0755 "$PACKAGE_ROOT/install-systemd-portable.sh" "$PACKAGE_ROOT/clean-install.sh" "$PACKAGE_ROOT/uninstall-systemd-portable.sh"
ARCHIVE="$OUTPUT_DIR/drosync-${VERSION}-${PLATFORM_KEY}.tar.gz"
tar --sort=name --mtime='@0' --owner=0 --group=0 --numeric-owner \

View File

@ -0,0 +1,167 @@
#!/usr/bin/env bash
# ==============================================================================
# clean-install.sh
# 彻底清理旧版本脏数据、僵死 Session、残留 Socket,并安全安装/升级 drosync
# ==============================================================================
set -euo pipefail
if [[ "${EUID:-$(id -u)}" -ne 0 ]]; then
echo "❌ 请使用 root 权限运行此脚本 (例如: sudo $0)" >&2
exit 1
fi
INSTALL_ROOT="/opt/drosync"
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
CLEAN_MODE="safe" # safe (默认:保留配置,清理脏会话/缓存) 或 full (彻底重置数据库)
usage() {
cat <<EOF
用法: $0 [选项]
选项:
--safe (默认) 安全模式:保留配置、Token和Mapping,清理僵死Session与残留Socket
--full 彻底重置模式:备份并移除历史数据库 state.db(保留 token 认证凭证)
--prefix DIR 安装目录 (默认: /opt/drosync)
-h, --help 显示此帮助信息
EOF
}
while [[ $# -gt 0 ]]; do
case "$1" in
--safe)
CLEAN_MODE="safe"
shift
;;
--full|--reset)
CLEAN_MODE="full"
shift
;;
--prefix)
[[ $# -ge 2 ]] || { usage; exit 2; }
INSTALL_ROOT="$2"
shift 2
;;
-h|--help)
usage
exit 0
;;
*)
usage
exit 2
;;
esac
done
echo "======================================================================"
echo "🚀 开始执行 drosync 安装与脏数据清理 (模式: $CLEAN_MODE)"
echo "======================================================================"
# 1. 停止运行中的 systemd 服务
echo "⏹️ 正在停止 systemd 服务..."
WAS_RUNNING=0
if systemctl is-active --quiet drosync.service 2>/dev/null; then
WAS_RUNNING=1
systemctl stop drosync.service || true
fi
# 2. 杀掉可能残留的前台或孤儿进程
echo "🧹 检查并清理孤儿进程..."
killall -9 drosync-daemon 2>/dev/null || true
killall -9 drosync 2>/dev/null || true
pkill -9 -f "drosync web" 2>/dev/null || true
pkill -9 -f "drosync-daemon" 2>/dev/null || true
# 3. 清理残留的 IPC Socket 与临时锁
echo "🧹 清理残留的 IPC Socket 和锁文件..."
rm -f /var/lib/drosync/drosync.sock /var/lib/drosync/drosync/drosync.sock
rm -f /var/run/drosync/drosync.sock /run/drosync/drosync.sock
rm -f /tmp/drosync*.sock
rm -f /var/lib/drosync/*.db-wal /var/lib/drosync/*.db-shm
rm -f /var/lib/drosync/drosync/*.db-wal /var/lib/drosync/drosync/*.db-shm
# 4. 清理数据库脏数据
echo "📦 清理本地数据库脏数据..."
for DB_PATH in /var/lib/drosync/state.db /var/lib/drosync/drosync/state.db; do
if [[ -f "$DB_PATH" ]]; then
if [[ "$CLEAN_MODE" == "full" ]]; then
BACKUP_PATH="${DB_PATH}.bak.$(date +%s)"
echo " - [彻底清理] 备份并移除 $DB_PATH -> $BACKUP_PATH"
mv "$DB_PATH" "$BACKUP_PATH"
else
echo " - [安全自愈] 修复 $DB_PATH 中的未完结会话与旧缓存..."
if command -v sqlite3 >/dev/null 2>&1; then
sqlite3 "$DB_PATH" "UPDATE sessions SET status = 'aborted' WHERE status NOT IN ('completed', 'aborted', 'failed', 'partial', 'conflicted', 'expired');"
sqlite3 "$DB_PATH" "DELETE FROM meta WHERE key LIKE 'pending_journal:%';"
sqlite3 "$DB_PATH" "DELETE FROM scan_files;"
sqlite3 "$DB_PATH" "PRAGMA wal_checkpoint(TRUNCATE);"
else
echo " ℹ️ 未安装 sqlite3 命令,新版 drosync 将在启动时自动自愈未完成会话"
fi
fi
fi
done
# 5. 确保系统用户与目录权限
echo "👤 检查并配置 drosync 用户与权限..."
if ! getent group drosync >/dev/null 2>&1; then
groupadd --system drosync
fi
if ! getent passwd drosync >/dev/null 2>&1; then
useradd --system --gid drosync --home-dir /var/lib/drosync --no-create-home --shell /usr/sbin/nologin drosync
fi
install -d -o drosync -g drosync -m 0700 /var/lib/drosync
install -d -o drosync -g drosync -m 0700 /var/lib/drosync/config
install -d -m 0755 /etc/drosync "$INSTALL_ROOT"
if [[ ! -e /etc/drosync/environment ]]; then
printf '%s\n' 'DROSYNC_SECRET_FILE=/var/lib/drosync/token' >/etc/drosync/environment
chmod 0644 /etc/drosync/environment
fi
if [[ -f /var/lib/drosync/token ]]; then
chown drosync:drosync /var/lib/drosync/token
chmod 0600 /var/lib/drosync/token
fi
# 6. 安装/更新可执行文件
if [[ -f "$SOURCE_DIR/drosync" && -f "$SOURCE_DIR/drosync-daemon" ]]; then
echo "📥 正在安装二进制文件到 $INSTALL_ROOT..."
install -m 0755 "$SOURCE_DIR/drosync" "$INSTALL_ROOT/drosync"
install -m 0755 "$SOURCE_DIR/drosync-daemon" "$INSTALL_ROOT/drosync-daemon"
if [[ -f "$SOURCE_DIR/drosync-gui" ]]; then
install -m 0755 "$SOURCE_DIR/drosync-gui" "$INSTALL_ROOT/drosync-gui"
fi
if [[ -f "$SOURCE_DIR/drosync-portable.service" ]]; then
sed "s|@DROSYNC_INSTALL_ROOT@|$INSTALL_ROOT|g" "$SOURCE_DIR/drosync-portable.service" \
>/etc/systemd/system/drosync.service
chmod 0644 /etc/systemd/system/drosync.service
fi
elif [[ -x "$INSTALL_ROOT/drosync" && -x "$INSTALL_ROOT/drosync-daemon" ]]; then
echo "ℹ️ 使用现有安装的二进制文件: $INSTALL_ROOT"
else
echo "❌ 错误: 未在 $SOURCE_DIR 或 $INSTALL_ROOT 找到可执行文件 drosync / drosync-daemon" >&2
exit 1
fi
chown -R drosync:drosync /var/lib/drosync
# 7. 重载并启动服务
echo "🔄 重载 systemd 并启动服务..."
systemctl daemon-reload
systemctl enable drosync.service
systemctl restart drosync.service
# 8. 健康检查
sleep 1.5
if systemctl is-active --quiet drosync.service; then
echo "✅ drosync.service 服务已成功运行!"
sudo env XDG_DATA_HOME=/var/lib/drosync XDG_CONFIG_HOME=/var/lib/drosync/config "$INSTALL_ROOT/drosync" version 2>/dev/null || true
else
echo "⚠️ drosync.service 启动可能异常,请检查日志: journalctl -u drosync.service -n 20"
fi
echo "======================================================================"
echo "🎉 安装与清理已完成!"
echo "======================================================================"

View File

@ -9,9 +9,10 @@ fi
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
INSTALL_ROOT="/opt/drosync"
ENABLE=0
CLEAN_MODE=""
usage() {
echo "usage: $0 [--prefix /opt/drosync] [--enable]" >&2
echo "usage: $0 [--prefix /opt/drosync] [--enable] [--clean] [--full-clean]" >&2
}
while [[ $# -gt 0 ]]; do
@ -25,6 +26,14 @@ while [[ $# -gt 0 ]]; do
ENABLE=1
shift
;;
--clean|--safe)
CLEAN_MODE="safe"
shift
;;
--full-clean|--full|--reset)
CLEAN_MODE="full"
shift
;;
-h|--help)
usage
exit 0
@ -53,6 +62,40 @@ if ! ldconfig -p 2>/dev/null | grep -Fq 'libdbus-1.so.3'; then
exit 1
fi
# 1. Stop existing service and clean up stale processes before updating binaries
WAS_RUNNING=0
if systemctl is-active --quiet drosync.service 2>/dev/null; then
WAS_RUNNING=1
systemctl stop drosync.service || true
fi
killall -9 drosync-daemon 2>/dev/null || true
pkill -9 -f "drosync-daemon" 2>/dev/null || true
# 2. Always clean stale socket files and lock files
rm -f /var/lib/drosync/drosync.sock /var/lib/drosync/drosync/drosync.sock
rm -f /var/run/drosync/drosync.sock /run/drosync/drosync.sock
rm -f /tmp/drosync*.sock
rm -f /var/lib/drosync/*.db-wal /var/lib/drosync/*.db-shm
rm -f /var/lib/drosync/drosync/*.db-wal /var/lib/drosync/drosync/*.db-shm
# 3. Clean dirty database records if requested
if [[ -n "$CLEAN_MODE" ]]; then
for db in /var/lib/drosync/state.db /var/lib/drosync/drosync/state.db; do
if [[ -f "$db" ]]; then
if [[ "$CLEAN_MODE" == "full" ]]; then
mv "$db" "${db}.bak.$(date +%s)"
else
if command -v sqlite3 >/dev/null 2>&1; then
sqlite3 "$db" "UPDATE sessions SET status = 'aborted' WHERE status NOT IN ('completed', 'aborted', 'failed', 'partial', 'conflicted', 'expired');" 2>/dev/null || true
sqlite3 "$db" "DELETE FROM meta WHERE key LIKE 'pending_journal:%';" 2>/dev/null || true
sqlite3 "$db" "DELETE FROM scan_files;" 2>/dev/null || true
sqlite3 "$db" "PRAGMA wal_checkpoint(TRUNCATE);" 2>/dev/null || true
fi
fi
fi
done
fi
if ! getent group drosync >/dev/null 2>&1; then
groupadd --system drosync
fi
@ -66,6 +109,10 @@ if [[ ! -e /etc/drosync/environment ]]; then
printf '%s\n' 'DROSYNC_SECRET_FILE=/var/lib/drosync/token' >/etc/drosync/environment
chmod 0644 /etc/drosync/environment
fi
if [[ -f /var/lib/drosync/token ]]; then
chown drosync:drosync /var/lib/drosync/token
chmod 0600 /var/lib/drosync/token
fi
install -m 0755 "$SOURCE_DIR/drosync" "$INSTALL_ROOT/drosync"
install -m 0755 "$SOURCE_DIR/drosync-daemon" "$INSTALL_ROOT/drosync-daemon"
if [[ -f "$SOURCE_DIR/drosync-gui" ]]; then
@ -75,7 +122,7 @@ sed "s|@DROSYNC_INSTALL_ROOT@|$INSTALL_ROOT|g" "$SOURCE_DIR/drosync-portable.ser
>/etc/systemd/system/drosync.service
chmod 0644 /etc/systemd/system/drosync.service
systemctl daemon-reload
if [[ "$ENABLE" == 1 ]]; then
systemctl enable --now drosync.service
if [[ "$ENABLE" == 1 || "$WAS_RUNNING" == 1 ]]; then
systemctl restart drosync.service
fi
echo "installed drosync portable systemd bundle to $INSTALL_ROOT"