mirror of
https://gitee.com/amber-ce/amber-pm
synced 2026-05-14 02:00:20 +08:00
refactor(apm-dummy): 优化覆盖操作逻辑并减少冗余日志
改进覆盖操作的文件更新检查机制,仅在需要时执行覆盖 调整日志输出策略,减少非必要信息,仅在verbose模式或实际有改动时输出详情
This commit is contained in:
@@ -3,7 +3,7 @@ Version: 1.1.4
|
|||||||
Maintainer: shenmo <jifengshenmo@outlook.com>
|
Maintainer: shenmo <jifengshenmo@outlook.com>
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: utils
|
Section: utils
|
||||||
Installed-Size: 68
|
Installed-Size: 72
|
||||||
Description: A empty package to satisfy depends--Also,manage in-apm-runtime cloud configs
|
Description: A empty package to satisfy depends--Also,manage in-apm-runtime cloud configs
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Homepage: https://shenmo7192.gitee.io/
|
Homepage: https://shenmo7192.gitee.io/
|
||||||
|
|||||||
@@ -67,23 +67,20 @@ fi
|
|||||||
|
|
||||||
# 检查源目录是否为空
|
# 检查源目录是否为空
|
||||||
if [ -z "$(ls -A "$OVERRIDE_SOURCE" 2>/dev/null)" ]; then
|
if [ -z "$(ls -A "$OVERRIDE_SOURCE" 2>/dev/null)" ]; then
|
||||||
log_warn "源目录为空: $OVERRIDE_SOURCE"
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
log_info "开始覆盖操作..."
|
$VERBOSE && log_info "源目录: $OVERRIDE_SOURCE"
|
||||||
log_info "源目录: $OVERRIDE_SOURCE"
|
|
||||||
|
|
||||||
# 检查 APM 基础目录是否存在
|
# 检查 APM 基础目录是否存在
|
||||||
if [ ! -d "$APM_BASE_DIR" ]; then
|
if [ ! -d "$APM_BASE_DIR" ]; then
|
||||||
log_error "APM 基础目录不存在: $APM_BASE_DIR"
|
exit 0
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 计数器
|
# 计数器
|
||||||
OVERRIDE_COUNT=0
|
OVERRIDE_COUNT=0
|
||||||
SKIPPED_COUNT=0
|
|
||||||
ERROR_COUNT=0
|
ERROR_COUNT=0
|
||||||
|
HAS_CHANGES=false
|
||||||
|
|
||||||
# 遍历 /var/lib/apm/ 下的所有子目录
|
# 遍历 /var/lib/apm/ 下的所有子目录
|
||||||
for pkg_dir in "$APM_BASE_DIR"/*/; do
|
for pkg_dir in "$APM_BASE_DIR"/*/; do
|
||||||
@@ -111,11 +108,30 @@ for pkg_dir in "$APM_BASE_DIR"/*/; do
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
log_info "处理包: $pkg_name -> $target_dir"
|
# 检查是否有文件需要更新(比较源文件和目标文件)
|
||||||
|
NEED_UPDATE=false
|
||||||
|
while IFS= read -r -d '' file; do
|
||||||
|
rel_path="${file#$OVERRIDE_SOURCE/}"
|
||||||
|
target_file="$target_dir/$rel_path"
|
||||||
|
# 如果目标文件不存在或源文件更新,则需要更新
|
||||||
|
if [ ! -e "$target_file" ] || [ "$file" -nt "$target_file" ]; then
|
||||||
|
NEED_UPDATE=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done < <(find "$OVERRIDE_SOURCE" -type f -print0 2>/dev/null)
|
||||||
|
|
||||||
|
# 如果没有需要更新的文件,跳过
|
||||||
|
if [ "$NEED_UPDATE" = false ]; then
|
||||||
|
$VERBOSE && log_debug "跳过 $pkg_name: 文件已是最新"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
HAS_CHANGES=true
|
||||||
|
$VERBOSE && log_info "处理包: $pkg_name"
|
||||||
|
|
||||||
# 使用 rsync 或 cp 进行覆盖
|
# 使用 rsync 或 cp 进行覆盖
|
||||||
if [ "$DRY_RUN" = true ]; then
|
if [ "$DRY_RUN" = true ]; then
|
||||||
log_info "[试运行] 将覆盖文件到: $target_dir"
|
$VERBOSE && log_info "[试运行] 将覆盖文件到: $target_dir"
|
||||||
find "$OVERRIDE_SOURCE" -type f | while read -r file; do
|
find "$OVERRIDE_SOURCE" -type f | while read -r file; do
|
||||||
rel_path="${file#$OVERRIDE_SOURCE/}"
|
rel_path="${file#$OVERRIDE_SOURCE/}"
|
||||||
target_file="$target_dir/$rel_path"
|
target_file="$target_dir/$rel_path"
|
||||||
@@ -125,7 +141,7 @@ for pkg_dir in "$APM_BASE_DIR"/*/; do
|
|||||||
else
|
else
|
||||||
# 使用 cp -r 进行递归复制,保留权限
|
# 使用 cp -r 进行递归复制,保留权限
|
||||||
if cp -rL "$OVERRIDE_SOURCE"/* "$target_dir/" 2>/dev/null; then
|
if cp -rL "$OVERRIDE_SOURCE"/* "$target_dir/" 2>/dev/null; then
|
||||||
log_info "成功覆盖到: $target_dir"
|
$VERBOSE && log_info "成功覆盖到: $target_dir"
|
||||||
((OVERRIDE_COUNT++))
|
((OVERRIDE_COUNT++))
|
||||||
else
|
else
|
||||||
log_error "覆盖失败: $target_dir"
|
log_error "覆盖失败: $target_dir"
|
||||||
@@ -134,15 +150,17 @@ for pkg_dir in "$APM_BASE_DIR"/*/; do
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# 输出统计信息
|
# 只有在有改动或 verbose 模式时才输出统计信息
|
||||||
log_info "===================================="
|
if [ "$HAS_CHANGES" = true ] || [ "$VERBOSE" = true ]; then
|
||||||
log_info "覆盖操作完成"
|
$VERBOSE && log_info "===================================="
|
||||||
log_info "成功处理: $OVERRIDE_COUNT 个包"
|
$VERBOSE && log_info "覆盖操作完成"
|
||||||
if [ "$DRY_RUN" = true ]; then
|
log_info "成功处理: $OVERRIDE_COUNT 个包"
|
||||||
log_info "[试运行模式] 未实际执行覆盖"
|
if [ "$DRY_RUN" = true ]; then
|
||||||
fi
|
log_info "[试运行模式] 未实际执行覆盖"
|
||||||
if [ $ERROR_COUNT -gt 0 ]; then
|
fi
|
||||||
log_error "失败: $ERROR_COUNT 个包"
|
if [ $ERROR_COUNT -gt 0 ]; then
|
||||||
|
log_error "失败: $ERROR_COUNT 个包"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
Reference in New Issue
Block a user