修复pixmaps问题

添加 XFCE/DDE 桌面环境检测函数，优化目标目录选择逻辑
重构老链接迁移逻辑，支持双向迁移并正确处理空目录

apm-dummy/DEBIAN/control

@@ -1,9 +1,9 @@
 Package: apm
-Version: 1.1.3
+Version: 1.1.5
 Maintainer: shenmo <jifengshenmo@outlook.com>
 Priority: optional
 Section: utils
-Installed-Size: 36
-Description: A empty package to satisfy depends
+Installed-Size: 76
+Description: A empty package to satisfy depends--Also,manage in-apm-runtime cloud configs
 Architecture: all
 Homepage: https://shenmo7192.gitee.io/

apm-dummy/DEBIAN/postinst

@@ -5,8 +5,12 @@ export PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"
 case "$1" in
 	triggered)
 			amber-pm-dstore-patch
+            amber-pm-base-overrider
 
 	;;
+	*)
+            amber-pm-base-overrider
+	;;
 esac
 
 

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.

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
+

apm-dummy/usr/bin/amber-pm-base-overrider

@@ -0,0 +1,166 @@
+#!/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 <<EOF
+amber-pm-base-overrider - APM 基础环境覆盖工具
+
+用法:
+  $(basename "$0") [选项]
+
+选项:
+  -h, --help      显示此帮助信息
+  -v, --verbose   显示详细输出
+  -n, --dry-run   试运行，不实际执行覆盖操作
+
+功能:
+  检查 /opt/apm-dummy/files-to-override 下的文件，
+  并覆盖到所有 /var/lib/apm/<包名>/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
+    exit 0
+fi
+
+$VERBOSE && log_info "源目录: $OVERRIDE_SOURCE"
+
+# 检查 APM 基础目录是否存在
+if [ ! -d "$APM_BASE_DIR" ]; then
+    exit 0
+fi
+
+# 计数器
+OVERRIDE_COUNT=0
+ERROR_COUNT=0
+HAS_CHANGES=false
+
+# 遍历 /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
+
+    # 检查是否有文件需要更新（比较源文件和目标文件）
+    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 进行覆盖
+    if [ "$DRY_RUN" = true ]; then
+        $VERBOSE && 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
+            $VERBOSE && log_info "成功覆盖到: $target_dir"
+            ((OVERRIDE_COUNT++))
+        else
+            log_error "覆盖失败: $target_dir"
+            ((ERROR_COUNT++))
+        fi
+    fi
+done
+
+# 只有在有改动或 verbose 模式时才输出统计信息
+if [ "$HAS_CHANGES" = true ] || [ "$VERBOSE" = true ]; then
+    $VERBOSE && log_info "===================================="
+    $VERBOSE && 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
+fi
+
+exit 0

build.config

@@ -1 +1 @@
-@VERSION@=1.2.4
+@VERSION@=1.2.5

src/usr/bin/amber-pm-desktop-fix

@@ -1,5 +1,37 @@
 #!/bin/bash
 
+# 检测是否安装了 XFCE、DDE 或 GNOME 桌面环境
+# 通过检查系统中是否存在相关的 desktop 文件或关键程序
+is_xfce_or_dde_or_gnome() {
+    # 检查 XFCE
+    if [ -f /usr/share/xsessions/xfce.desktop ] || \
+       [ -f /usr/local/share/xsessions/xfce.desktop ] || \
+       command -v xfce4-session >/dev/null 2>&1; then
+        return 0
+    fi
+    # 检查 DDE/Deepin
+    if [ -f /usr/share/xsessions/deepin.desktop ] || \
+       [ -f /usr/share/xsessions/dde.desktop ] || \
+       [ -f /usr/local/share/xsessions/deepin.desktop ] || \
+       [ -f /usr/local/share/xsessions/dde.desktop ] || \
+       command -v dde-session >/dev/null 2>&1 || \
+       command -v startdde >/dev/null 2>&1; then
+        return 0
+    fi
+    # 检查 GNOME
+    if [ -f /usr/share/xsessions/gnome.desktop ] || \
+       [ -f /usr/share/xsessions/gnome-xorg.desktop ] || \
+       [ -f /usr/share/xsessions/gnome-wayland.desktop ] || \
+       [ -f /usr/local/share/xsessions/gnome.desktop ] || \
+       [ -f /usr/local/share/xsessions/gnome-xorg.desktop ] || \
+       [ -f /usr/local/share/xsessions/gnome-wayland.desktop ] || \
+       command -v gnome-session >/dev/null 2>&1 || \
+       command -v gnome-shell >/dev/null 2>&1; then
+        return 0
+    fi
+    return 1
+}
+
 # 确定目标目录
 if grep -q "Kylin" /etc/os-release; then
     TARGET_BASE="/usr/share"
@@ -7,8 +39,14 @@ if grep -q "Kylin" /etc/os-release; then
     echo "检测到麒麟系统，使用目标目录: $TARGET_BASE"
 else
     TARGET_BASE="/usr/local/share"
-    APP_TARGET_DIR="$TARGET_BASE/applications/apm"
-    echo "检测到非麒麟系统，使用目标目录: $APP_TARGET_DIR"
+    # 检测是否为 XFCE、DDE 或 GNOME 桌面环境
+    if is_xfce_or_dde_or_gnome; then
+        APP_TARGET_DIR="$TARGET_BASE/applications"
+        echo "检测到 XFCE/DDE/GNOME 桌面环境，使用目标目录: $APP_TARGET_DIR"
+    else
+        APP_TARGET_DIR="$TARGET_BASE/applications/apm"
+        echo "使用目标目录: $APP_TARGET_DIR"
+    fi
 fi
 
 function ensure_dir() {
@@ -66,12 +104,24 @@ wait
 
 # 迁移老链接（仅非麒麟系统需要）
 if ! grep -q "Kylin" /etc/os-release; then
-    OLD_LINK_DIR="/usr/local/share/applications"
-    # 检查旧目录是否存在且不是apm子目录
-    if [ -d "$OLD_LINK_DIR" ] && [ "$OLD_LINK_DIR" != "$APP_TARGET_DIR" ]; then
+    # 定义可能的链接位置
+    APM_SUBDIR="/usr/local/share/applications/apm"
+    APP_ROOT_DIR="/usr/local/share/applications"
+    
+    # 根据当前目标目录，确定源目录
+    if [ "$APP_TARGET_DIR" = "$APM_SUBDIR" ]; then
+        # 当前目标是 apm 子目录，需要检查根目录是否有链接需要迁移
+        SOURCE_DIR="$APP_ROOT_DIR"
+    else
+        # 当前目标是根目录，需要检查 apm 子目录是否有链接需要迁移
+        SOURCE_DIR="$APM_SUBDIR"
+    fi
+    
+    # 检查源目录是否存在且与目标目录不同
+    if [ -d "$SOURCE_DIR" ] && [ "$SOURCE_DIR" != "$APP_TARGET_DIR" ]; then
         echo "检查并迁移老链接..."
-        # 查找旧目录中指向APM数据目录的符号链接
-        find "$OLD_LINK_DIR" -maxdepth 1 -type l | while read -r link; do
+        # 查找源目录中指向APM数据目录的符号链接
+        find "$SOURCE_DIR" -maxdepth 1 -type l 2>/dev/null | while read -r link; do
             target=$(readlink "$link")
             # 如果链接指向APM的数据目录
             if [[ "$target" == /var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/applications/* ]]; then
@@ -86,6 +136,11 @@ if ! grep -q "Kylin" /etc/os-release; then
                 fi
             fi
         done
+        
+        # 如果源目录是 apm 子目录且已空，尝试删除
+        if [ "$SOURCE_DIR" = "$APM_SUBDIR" ] && [ -d "$APM_SUBDIR" ]; then
+            rmdir "$APM_SUBDIR" 2>/dev/null || true
+        fi
     fi
 fi
 

src/usr/bin/amber-pm-upgrade-notifier

@@ -82,7 +82,8 @@ done
 
 # 每日更新星火源文件
 
-
+exit
+###########################################################################
 updatetext=$(LANGUAGE=en_US apm update 2>&1)
 
 # 在网络恢复后，继续更新操作

src/var/lib/apm/apm/files/amber-ce-tools/container-init/init.sh

@@ -125,21 +125,5 @@ ln -sfv /amber-ce-tools/bin-override/host-spawn-$(uname -m) /amber-ce-tools/bin-
 
 exit 0
 
-## install host-integration
-pushd /amber-ce-tools/ace-host-integration
-
-dpkg-deb -Z xz -b . ../ace-host-integration.deb
-
-popd
-apt install --reinstall /amber-ce-tools/ace-host-integration.deb -y
 
 
-cd /amber-ce-tools/data-dir/
-mkdir -p usr/share/templates  
-ln -sfv ../../usr/share/applications/ .
-ln -sfv ../../usr/share/icons/ .
-ln -sfv ../../usr/share/templates/   .
-#ln -svf ../../usr/share/mime .
-rm -vf ./mime
-update-desktop-database /usr/share/applications || true
-update-mime-database /usr/share/mime || true

src/var/lib/apm/apm/files/bin/ace-init

@@ -114,8 +114,10 @@ ln -sv ../../usr/share/applications $chrootEnvPath/amber-ce-tools/data-dir/
 ln -sv ../../usr/share/icons $chrootEnvPath/amber-ce-tools/data-dir/
 mkdir -p $chrootEnvPath/usr/share/templates  
 ln -sfv ../../usr/share/templates/   $chrootEnvPath/amber-ce-tools/data-dir/
-mkdir -p $chrootEnvPath/usr/share/templates  
+mkdir -p $chrootEnvPath/usr/share/mime
 ln -sfv ../../usr/share/mime/   $chrootEnvPath/amber-ce-tools/data-dir/
+mkdir -p $chrootEnvPath/usr/share/pixmaps
+ln -sfv ../../usr/share/pixmaps/   $chrootEnvPath/amber-ce-tools/data-dir/
 
 chmod 777 -R $chrootEnvPath/usr/share/icons
 rm -vfr $chrootEnvPath/dev/*