From 50de602f6eeed8fda2cc60a04d2bcb05aa35c2b0 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 5 Apr 2026 12:19:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(apm-dummy):=20=E6=B7=BB=E5=8A=A0=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E7=8E=AF=E5=A2=83=E8=A6=86=E7=9B=96=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E5=92=8C=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加 amber-pm-base-overrider 脚本用于覆盖 APM 基础环境配置 在 postinst 中触发新添加的覆盖工具 新增 README.md 和桌面文件用于 ACE 容器环境配置 更新 control 文件描述以包含云配置管理功能 --- apm-dummy/DEBIAN/control | 4 +- apm-dummy/DEBIAN/postinst | 1 + .../README.md | 1 + .../applications/ace-run-in-host-os.desktop | 10 ++ apm-dummy/usr/bin/amber-pm-base-overrider | 0 src/usr/bin/amber-pm-base-overrider | 148 ++++++++++++++++++ 6 files changed, 162 insertions(+), 2 deletions(-) create mode 100755 apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/README.md create mode 100755 apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop create mode 100755 apm-dummy/usr/bin/amber-pm-base-overrider create mode 100755 src/usr/bin/amber-pm-base-overrider diff --git a/apm-dummy/DEBIAN/control b/apm-dummy/DEBIAN/control index 667f844..2e75f91 100755 --- a/apm-dummy/DEBIAN/control +++ b/apm-dummy/DEBIAN/control @@ -1,9 +1,9 @@ Package: apm -Version: 1.1.3 +Version: 1.1.4 Maintainer: shenmo Priority: optional Section: utils Installed-Size: 36 -Description: A empty package to satisfy depends +Description: A empty package to satisfy depends--Also,manage in-apm-runtime cloud configs Architecture: all Homepage: https://shenmo7192.gitee.io/ diff --git a/apm-dummy/DEBIAN/postinst b/apm-dummy/DEBIAN/postinst index c244b97..59dcc04 100755 --- a/apm-dummy/DEBIAN/postinst +++ b/apm-dummy/DEBIAN/postinst @@ -5,6 +5,7 @@ export PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE" case "$1" in triggered) amber-pm-dstore-patch + amber-pm-base-overrider ;; esac diff --git a/apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/README.md b/apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/README.md new file mode 100755 index 0000000..c520540 --- /dev/null +++ b/apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/README.md @@ -0,0 +1 @@ +# File in this dir will be seen as one of XDG_DATA_DIRS in ACE container. diff --git a/apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop b/apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop new file mode 100755 index 0000000..ae6f244 --- /dev/null +++ b/apm-dummy/opt/apm-dummy/files-to-override/amber-ce-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Exec=xdg-open %U +MimeType=x-scheme-handler/spk;inode/directory;application/x-mimearchive;x-scheme-handler/http;x-scheme-handler/https;application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/x-gzip;application/zip;application/rar;application/x-tar;application/pdf;application/rtf;image/gif;image/jpeg;image/jp2;image/png;image/tiff;image/bmp;image/svg+xml;image/webp;image/x-icon;application/kswps;application/kset;application/ksdps;application/x-photoshop;application/x-coreldraw;application/x-shockwave-flash;text/plain;application/x-javascript;text/javascript;text/css;text/html;application/xhtml+xml;text/xml;text/x-vcard;application/x-httpd-php;application/java-archive;application/vnd.android.package-archive;application/octet-stream;application/x-x509-user-cert;audio/mpeg;audio/midi;audio/x-wav;audio/x-mpegurl;audio/x-m4a;audio/ogg;audio/x-realaudio;video/mp4;video/mpeg;video/quicktime;video/x-m4v;video/x-ms-wmv;video/x-msvideo;video/webm;video/x-flv;application/xhtml_xml; +Name=ace-run-in-host-os +NoDisplay=true +Terminal=false +TryExec= +Type=Application +Version=1.0 + diff --git a/apm-dummy/usr/bin/amber-pm-base-overrider b/apm-dummy/usr/bin/amber-pm-base-overrider new file mode 100755 index 0000000..e69de29 diff --git a/src/usr/bin/amber-pm-base-overrider b/src/usr/bin/amber-pm-base-overrider new file mode 100755 index 0000000..557481d --- /dev/null +++ b/src/usr/bin/amber-pm-base-overrider @@ -0,0 +1,148 @@ +#!/bin/bash + +# amber-pm-base-overrider +# 功能：检查 /opt/apm-dummy/files-to-override 下的文件，并覆盖到所有包含 +# /var/lib/apm/文件夹/files 的 /var/lib/apm/文件夹/files/ace-env 下 + +# 日志函数 +log_warn() { echo -e "[\e[33mWARN\e[0m]: \e[1m$*\e[0m"; } +log_error() { echo -e "[\e[31mERROR\e[0m]: \e[1m$*\e[0m"; } +log_info() { echo -e "[\e[96mINFO\e[0m]: \e[1m$*\e[0m"; } +log_debug() { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; } + +# 配置 +OVERRIDE_SOURCE="/opt/apm-dummy/files-to-override" +APM_BASE_DIR="/var/lib/apm" + +# 显示帮助信息 +show_help() { + cat </files/ace-env 目录下。 +EOF +} + +# 解析参数 +VERBOSE=false +DRY_RUN=false + +while [[ $# -gt 0 ]]; do + case $1 in + -h|--help) + show_help + exit 0 + ;; + -v|--verbose) + VERBOSE=true + shift + ;; + -n|--dry-run) + DRY_RUN=true + shift + ;; + *) + log_error "未知选项: $1" + show_help + exit 1 + ;; + esac +done + +# 检查源目录是否存在 +if [ ! -d "$OVERRIDE_SOURCE" ]; then + log_error "源目录不存在: $OVERRIDE_SOURCE" + exit 1 +fi + +# 检查源目录是否为空 +if [ -z "$(ls -A "$OVERRIDE_SOURCE" 2>/dev/null)" ]; then + log_warn "源目录为空: $OVERRIDE_SOURCE" + exit 0 +fi + +log_info "开始覆盖操作..." +log_info "源目录: $OVERRIDE_SOURCE" + +# 检查 APM 基础目录是否存在 +if [ ! -d "$APM_BASE_DIR" ]; then + log_error "APM 基础目录不存在: $APM_BASE_DIR" + exit 1 +fi + +# 计数器 +OVERRIDE_COUNT=0 +SKIPPED_COUNT=0 +ERROR_COUNT=0 + +# 遍历 /var/lib/apm/ 下的所有子目录 +for pkg_dir in "$APM_BASE_DIR"/*/; do + # 去掉末尾的斜杠 + pkg_dir="${pkg_dir%/}" + + # 检查是否是目录 + if [ ! -d "$pkg_dir" ]; then + continue + fi + + pkg_name=$(basename "$pkg_dir") + files_dir="$pkg_dir/files" + target_dir="$files_dir/ace-env" + + # 检查是否存在 files 目录 + if [ ! -d "$files_dir" ]; then + $VERBOSE && log_debug "跳过 $pkg_name: 不存在 files 目录" + continue + fi + + # 检查是否存在 ace-env 目录 + if [ ! -d "$target_dir" ]; then + $VERBOSE && log_debug "跳过 $pkg_name: 不存在 ace-env 目录" + continue + fi + + log_info "处理包: $pkg_name -> $target_dir" + + # 使用 rsync 或 cp 进行覆盖 + if [ "$DRY_RUN" = true ]; then + log_info "[试运行] 将覆盖文件到: $target_dir" + find "$OVERRIDE_SOURCE" -type f | while read -r file; do + rel_path="${file#$OVERRIDE_SOURCE/}" + target_file="$target_dir/$rel_path" + echo " 将复制: $rel_path -> $target_file" + done + ((OVERRIDE_COUNT++)) + else + # 使用 cp -r 进行递归复制，保留权限 + if cp -rL "$OVERRIDE_SOURCE"/* "$target_dir/" 2>/dev/null; then + log_info "成功覆盖到: $target_dir" + ((OVERRIDE_COUNT++)) + else + log_error "覆盖失败: $target_dir" + ((ERROR_COUNT++)) + fi + fi +done + +# 输出统计信息 +log_info "====================================" +log_info "覆盖操作完成" +log_info "成功处理: $OVERRIDE_COUNT 个包" +if [ "$DRY_RUN" = true ]; then + log_info "[试运行模式] 未实际执行覆盖" +fi +if [ $ERROR_COUNT -gt 0 ]; then + log_error "失败: $ERROR_COUNT 个包" +fi + +exit 0