update src/usr/bin/amber-pm-convert.

Signed-off-by: shenmo <jifengshenmo@outlook.com>

apm-dummy/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: apm
-Version: 1.1.2
+Version: 1.1.3
 Maintainer: shenmo <jifengshenmo@outlook.com>
 Priority: optional
 Section: utils

apm-dummy/usr/bin/amber-pm-dstore-patch

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-
-
-
-
 enumAppInfoList() {
     appInfoList=()
     apps="/var/lib/apm"
@@ -13,6 +9,7 @@ enumAppInfoList() {
     done
     echo "${appInfoList[@]}"
 }
+
 linkDir() {
     ensureTargetDir() {
         targetFile=$1
@@ -26,8 +23,6 @@ linkDir() {
     targetDir=$(dirname "$target")
     find "$source" -type f | while read sourceFile; do
         targetFile="$targetDir/${sourceFile#$sourceDir/}"
-
-
         ensureTargetDir "$targetFile"
         sourceFile=$(realpath --relative-to="$(dirname $targetFile)" "$sourceFile" )
         if [  ! -e "${targetFile}" ];then
@@ -36,7 +31,6 @@ linkDir() {
     done
 }
 
-
 linkApp() {
     appID=$1
     appEntriesDir="/var/lib/apm/$appID/entries"
@@ -53,6 +47,21 @@ linkApp() {
         if [ ! -d "$folder" ]; then
             continue
         fi
+
+        # 对于 applications 目录，先为所有 .desktop 文件添加必要的字段
+        if [ "$folder" = "$appEntriesDir/applications" ]; then
+            find "$folder" -name "*.desktop" -type f | while read desktop; do
+                # 添加 X-APM-APPID
+                if ! grep -q "^X-APM-APPID=" "$desktop"; then
+                    echo "X-APM-APPID=$appID" >> "$desktop"
+                fi
+                # 添加 X-Deepin-PreUninstall
+                if ! grep -q "^X-Deepin-PreUninstall=" "$desktop"; then
+                    echo "X-Deepin-PreUninstall=amber-pm-app-uninstaller $appID" >> "$desktop"
+                fi
+            done
+        fi
+
         if [ "$folder" = "$appEntriesDir/polkit" ]; then
             linkDir "$folder" "/usr/share/polkit-1"
         elif [ "$folder" = "$appEntriesDir/fonts/conf" ]; then
@@ -64,32 +73,29 @@ linkApp() {
 }
 
 function exec_uos_package_link(){
-
-for app in $(enumAppInfoList); do
+    for app in $(enumAppInfoList); do
         linkApp "$app" &
-
-done
-wait
+    done
+    wait
 }
 
 function exec_v23_icon_link(){
-# Fix v23 broken icon
-if [ ! -d "/usr/share/icons/hicolor/scalable/apps" ];then
-mkdir -p /usr/share/icons/hicolor/scalable/apps
-fi
+    # Fix v23 broken icon
+    if [ ! -d "/usr/share/icons/hicolor/scalable/apps" ];then
+        mkdir -p /usr/share/icons/hicolor/scalable/apps
+    fi
 
-for icon_root_icon_path in $(ls /usr/share/icons/*.png /usr/share/icons/*.svg 2>/dev/null)
-do
-target_icon_path=/usr/share/icons/hicolor/scalable/apps/$(basename ${icon_root_icon_path})
-if [  ! -e ${target_icon_path} ];then
-ln -sv $(realpath --relative-to=/usr/share/icons/hicolor/scalable/apps ${icon_root_icon_path}) /usr/share/icons/hicolor/scalable/apps
-fi
-done
+    for icon_root_icon_path in $(ls /usr/share/icons/*.png /usr/share/icons/*.svg 2>/dev/null)
+    do
+        target_icon_path=/usr/share/icons/hicolor/scalable/apps/$(basename ${icon_root_icon_path})
+        if [  ! -e ${target_icon_path} ];then
+            ln -sv $(realpath --relative-to=/usr/share/icons/hicolor/scalable/apps ${icon_root_icon_path}) /usr/share/icons/hicolor/scalable/apps
+        fi
+    done
 }
 
 function exec_link_clean(){
-# remove broken links in /usr/share
-
+    # remove broken links in /usr/share
     find /usr/share/applications -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/icons -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/mime/packages -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
@@ -98,35 +104,32 @@ function exec_link_clean(){
     find /usr/share/fcitx -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/help -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/locale -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
-#    find /usr/lib/$(gcc -dumpmachine)/fcitx -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/lib/mozilla/plugins -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/polkit-1/actions -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /usr/share/fonts -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
     find /etc/fonts/conf.d -xtype l -exec echo '{} is invalid now and going to be cleaned' \; -exec unlink  {} \; 2>/dev/null &
-
-
 }
+
 function exec_uos_package_update(){
     update-icon-caches /usr/share/icons/* > /dev/null 2>&1 &
     update-desktop-database -q > /dev/null 2>&1 &
     update-mime-database -V /usr/share/mime > /dev/null 2>&1 &
     glib-compile-schemas /usr/share/glib-2.0/schemas/ > /dev/null 2>&1 &
-
 }
 
 function exec_debian_compatibile_links(){
-# 源目录和目标目录定义
-local SOURCE_DIR="/var/lib/apm"
-local TARGET_DIR="/var/lib/apm/apm/files/ace-env/var/lib/apm"
+    # 源目录和目标目录定义
+    local SOURCE_DIR="/var/lib/apm"
+    local TARGET_DIR="/var/lib/apm/apm/files/ace-env/var/lib/apm"
 
-# 检查目标目录是否存在
-if [[ ! -d "$TARGET_DIR" ]]; then
+    # 检查目标目录是否存在
+    if [[ ! -d "$TARGET_DIR" ]]; then
         mkdir -p $TARGET_DIR
-fi
+    fi
 
-# 第一部分：为缺失的目录创建软链接
-echo "检查并创建缺失的软链接..."
-for dir in "$SOURCE_DIR"/*/; do
+    # 第一部分：为缺失的目录创建软链接
+    echo "检查并创建缺失的软链接..."
+    for dir in "$SOURCE_DIR"/*/; do
         # 获取目录名（去掉路径和尾部斜杠）
         dirname=$(basename "$dir")
         
@@ -141,11 +144,11 @@ for dir in "$SOURCE_DIR"/*/; do
             echo "创建软链接: $target_link -> $dir"
             ln -sv "$dir" "$target_link"
         fi
-done
+    done
 
-# 第二部分：清理无效的软链接
-echo "清理无效的软链接..."
-for link in "$TARGET_DIR"/*; do
+    # 第二部分：清理无效的软链接
+    echo "清理无效的软链接..."
+    for link in "$TARGET_DIR"/*; do
         # 检查是否为软链接
         if [[ -L "$link" ]]; then
             # 检查软链接是否有效（指向的目标是否存在）
@@ -154,21 +157,21 @@ for link in "$TARGET_DIR"/*; do
                 rm "$link"
             fi
         fi
-done
+    done
 }
+
 #########################################################################################
 echo "----------------Running APM Dstore Patch----------------"
 
-# execute linkApp function for each app and print output
+# 执行链接操作（同时完成 .desktop 字段添加）
 exec_uos_package_link
 
-
-#exec_v23_icon_link
+# exec_v23_icon_link
 exec_link_clean
 wait
 exec_uos_package_update
 if [[ "${IS_APM_ENV}" = "" ]];then
-exec_debian_compatibile_links
+    exec_debian_compatibile_links
 fi
 
 echo "----------------Finished----------------"

build.config

@@ -1 +1 @@
-@VERSION@=1.1.6
+@VERSION@=1.1.9

src/DEBIAN/control

@@ -4,7 +4,7 @@ Version: @VERSION@
 Architecture: amd64
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: 49000
-Depends: bubblewrap, flatpak,  policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils | xz,libnotify-bin,curl,xdg-user-dirs,bash
+Depends: zenity | garma,bubblewrap, flatpak,  policykit-1 | pkexec | polkit-1 | polkit, systemd, procps,coreutils,fuse-overlayfs,xz-utils | xz,libnotify-bin,curl,xdg-user-dirs,bash
 Recommends: dpkg, fakeroot, busybox
 Section: misc
 Conflicts: ace-host-integration

src/DEBIAN/postinst

@@ -15,7 +15,8 @@ systemctl restart apparmor.service || true
         fi
 		# Send statistics data
 		/var/lib/apm/apm/files/feedback.sh &
-
+        ln -sv  ../ /host
+		amber-pm-dstore-patch
 
 ;;
 	triggered)

src/usr/bin/amber-pm-app-launcher

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# ===== 日志函数（简化版）=====
+log.info()  { echo "INFO: $*"; }
+log.warn()  { echo "WARN: $*"; }
+log.error() { echo "ERROR: $*"; }
+log.debug() { :; }  # APM 场景下可禁用 debug 日志
+
+# ===== APM 专用桌面文件扫描（单文件）=====
+function scan_apm_desktop_log() {
+    unset desktop_file_path
+    local pkg_name="$1"
+    local desktop_dir="/var/lib/apm/apm/files/ace-env/var/lib/apm/${pkg_name}/entries/applications"
+
+    [ -d "$desktop_dir" ] || return 1
+
+    while IFS= read -r -d '' path; do
+        [ -f "$path" ] || continue
+        if ! grep -q 'NoDisplay=true' "$path" 2>/dev/null; then
+            log.info "Found valid APM desktop file: $path"
+            export desktop_file_path="$path"
+            return 0
+        fi
+    done < <(find "$desktop_dir" -name "*.desktop" -type f -print0 2>/dev/null)
+
+    return 1
+}
+
+# ===== APM 专用桌面文件扫描（多文件列表）=====
+function scan_apm_desktop_list() {
+    local pkg_name="$1"
+    local desktop_dir="/var/lib/apm/apm/files/ace-env/var/lib/apm/${pkg_name}/entries/applications"
+    local result=""
+
+    [ -d "$desktop_dir" ] || { echo ""; return; }
+
+    while IFS= read -r -d '' path; do
+        [ -f "$path" ] || continue
+        if ! grep -q 'NoDisplay=true' "$path" 2>/dev/null; then
+            result+="${path},"
+        fi
+    done < <(find "$desktop_dir" -name "*.desktop" -type f -print0 2>/dev/null)
+
+    echo "${result%,}"
+}
+
+# ===== 启动应用 =====
+function launch_app() {
+    local desktop_path="${1#file://}"
+    local exec_cmd
+    shift  # 移除第一个参数（desktop_path），剩余的是要传递给应用的参数
+
+    # 提取并清理 Exec 行（移除字段代码如 %f %u 等）
+    exec_cmd=$(grep -m1 '^Exec=' "$desktop_path" | cut -d= -f2- | sed 's/%[fFuUdDnNickvm]*//g; s/^[[:space:]]*//; s/[[:space:]]*$//')
+    [ -z "$exec_cmd" ] && return 1
+
+    # 如果有额外参数，添加到命令中
+    if [ $# -gt 0 ]; then
+        log.info "Launching with arguments: $*"
+        exec_cmd="$exec_cmd $*"
+    fi
+
+    log.info "Launching: $exec_cmd"
+    ${SHELL:-bash} -c "$exec_cmd" 
+}
+
+# 导出函数供 ACE 环境调用
+export -f launch_app scan_apm_desktop_log scan_apm_desktop_list log.info log.error
+
+# ===== 主逻辑 =====
+[ $# -lt 1 ] && {
+    log.error "Usage: $0 <apm-package-name> [additional arguments...]"
+    exit 1
+}
+
+pkg_name="$1"
+shift  # 移除包名参数，剩余的都是要传递给应用的参数
+
+# 直接执行 launch 逻辑，并将剩余参数传递给 launch_app
+if scan_apm_desktop_log "$pkg_name" && launch_app "$desktop_file_path" "$@"; then
+    exit 0
+else
+    exit 1
+fi

src/usr/bin/amber-pm-app-uninstaller

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# ===== Log =====
+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"; }
+
+# 获取原始用户（调用 pkexec 或 sudo 的用户）
+ORIGINAL_USER="${SUDO_USER:-$USER}"
+ORIGINAL_UID=$(id -u "$ORIGINAL_USER")
+ORIGINAL_DISPLAY="${DISPLAY:-:0}"
+ORIGINAL_XAUTHORITY="${XAUTHORITY:-$HOME/.Xauthority}"
+
+# 以原始用户身份运行图形界面命令
+function run_as_user() {
+    sudo -u "$ORIGINAL_USER" DISPLAY="$ORIGINAL_DISPLAY" XAUTHORITY="$ORIGINAL_XAUTHORITY" "$@"
+}
+
+function zenity() {
+    if [[ -e /usr/bin/garma ]]; then
+        run_as_user garma "$@"
+    else
+        run_as_user "$(command -v zenity)" "$@"
+    fi
+}
+
+function notify-send() {
+    local uid="$ORIGINAL_UID"
+    sudo -u "$ORIGINAL_USER" DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/${uid}/bus" zenity --notification --text="$@"
+}
+
+# 如果当前不是 root，则用 pkexec 重新执行并传递必要的环境变量
+if [ "$UID" != "0" ]; then
+    # 保存当前环境变量，通过 env 传递给 pkexec
+    exec pkexec "$0" "$@"
+    exit $?
+fi
+
+
+
+# 用户确认
+if zenity --question --text="即将卸载 $1\n请确认" --no-wrap; then
+    # 启动卸载命令（这里假设 apm 是系统命令，请根据实际情况调整）
+    # 注意：apm 可能不存在，可替换为 apt、dnf 等
+    apm autoremove "$1" -y
+    ret=$?
+
+
+fi
+
+notify-send "卸载完成"

src/usr/bin/amber-pm-convert

@@ -646,7 +646,26 @@ fi
     sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg aptss clean || true
     sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/lib/apt/lists || true
     sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/lib/aptss/lists || true
-    sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/cache/apt/* || true
+    sudo -E chrootEnvPath="$chrootEnvPath" /var/lib/apm/apm/files/ace-run-pkg rm -vfr /var/cache/apt/archives/* || true
+
+#清理 .dpkg-new 文件
+log.info "搜索并清理 .dpkg-new 文件..."
+# 在 core 目录下查找并删除所有以 .dpkg-new 结尾的文件
+# 删除 .dpkg-new 文件（去掉后缀）
+log.info "删除 .dpkg-new 文件.."
+find "$CRAFT_DIR/core" -name "*.dpkg-new"  2>/dev/null | while read -r file; do
+
+    sudo rm -vf "$file" 
+done
+
+# 统计清理结果
+COUNT=$(find "$CRAFT_DIR/core" -name "*.dpkg-new" -type f 2>/dev/null | wc -l)
+if [ "$COUNT" -eq 0 ]; then
+    log.info "已清理所有 .dpkg-new 文件"
+else
+    log.warn "仍有 $COUNT 个 .dpkg-new 文件存在"
+fi
+
 
 # 5. 创建新的 APM 包结构
 log.info "创建新的APM包结构..."

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

@@ -100,7 +100,7 @@ until ! echo $updatetext | grep -q "E:"; do
     updatetext=$(LANGUAGE=en_US apm update 2>&1)
     retry_count=$((retry_count + 1))
 done
-
+apm clean
 update_app_number=$(env LANGUAGE=en_US apm list --upgradable 2>/dev/null | grep -c upgradable)
 echo "update_app_number is $update_app_number" 
 

src/usr/bin/apm

@@ -21,9 +21,10 @@ Usage:
 Commands:
   install           安装软件包
   remove            卸载软件包
-  run <package>     运行指定软件包的可执行文件
-  sandbox-run <package> 运行指定软件包的可执行文件（主目录沙箱化）
-  bwrap-run <package> 运行指定软件包的可执行文件（使用特殊的挂载参数以支持bwrap）
+  launch <package> [args...]  启动软件包（通过应用启动器）
+  run <package> [EXEC_PATH] [args...]  运行指定软件包的可执行文件（可指定容器内路径）
+  sandbox-run <package> [EXEC_PATH] [args...] 运行指定软件包的可执行文件（主目录沙箱化）
+  bwrap-run <package> [EXEC_PATH] [args...] 运行指定软件包的可执行文件（使用特殊的挂载参数以支持bwrap）
 
   update            更新软件包信息
   hold              锁定软件包版本
@@ -195,8 +196,34 @@ apm_exec(){
     umount "/tmp/apm/${coredir}"
 }
 
+# 启动应用：通过 amber-pm-app-launcher 运行
+apm_launch() {
+    local pkg="$1"
+    shift
+    if [ -z "$pkg" ]; then
+        log.error "Package name required for 'launch' command"
+        return 1
+    fi
 
+    # 保存原始 PATH_PREFIX，检查包是否存在（逻辑同 run 分支）
+    local original_path_prefix="$PATH_PREFIX"
+    if ! [ -d "${PATH_PREFIX}/var/lib/apm/$pkg" ]; then
+        if [ -d "/var/lib/apm/$pkg" ]; then
+            PATH_PREFIX=""
+        else
+            log.error "Package not installed: $pkg"
+            return 1
+        fi
+    fi
 
+    # 调用应用启动器，传递所有参数
+    amber-pm-app-launcher "$pkg" "$@"
+    local exit_code=$?
+
+    # 恢复 PATH_PREFIX（不影响后续命令）
+    PATH_PREFIX="$original_path_prefix"
+    return $exit_code
+}
 
 # 调试信息函数
 debug_info() {
@@ -234,11 +261,11 @@ bronya_egg() {
     cat <<'EOF'
   _   __     ____            _       ____         __              
  | | / /__ _/ / /____ ______(_)__   / __/_ _____ / /____ __ _     
- | |/ / _ `/ /  '_/ // / __/ / -_) _\ \/ // (_-</ __/ -_)  ' \    
+ | |/ / _ `/ /  '_/ // / __/ / _-) _\ \/ // (_-</ __/ -_)  ' \    
  |___/\_,_/_/_/\_\\_, /_/ /_/\__/ /___/\_, /___/\__/\__/_/_/_/    
   / /  ___ ___ __/___/____/ /         /___/                       
  / /__/ _ `/ // / _ \/ __/ _ \                                    
-/____/\_,_/\_,_/_//_/\__/_//_/        
+/____/\_,_/_,_/_//_/\__/_//_/        
 
 Valkyrie 系统启动 - 重装小兔，Fire！
 💎 感谢 Anysets 为 AmberCE 和 AmberPM 的 Arch 架构支持提供帮助～
@@ -303,6 +330,7 @@ for dir in "$APM_BASE"/*/; do
     fi
 done
 }
+
 # 主命令处理
 case "$1" in
     install|full-upgrade|upgrade|reinstall)
@@ -310,6 +338,16 @@ case "$1" in
     shift
     amber-pm-debug aptss "$command" "$@"
     exit_code=$?
+    
+    # 如果第一次执行失败，尝试修复并重试
+    if [ $exit_code -ne 0 ]; then
+        log.warn "Command failed, attempting to fix with dpkg --configure -a..."
+        amber-pm-debug dpkg --configure -a
+        log.info "Retrying $command..."
+        amber-pm-debug aptss "$command" "$@"
+        exit_code=$?
+    fi
+    
     if [ $exit_code -eq 0 ]; then
         log.info "Operation successful"
     else
@@ -319,6 +357,7 @@ case "$1" in
     amber-pm-debug amber-pm-dstore-patch
     apm-nvidia-toggle
     amber-pm-gxde-desktop-fix
+    update-mime-database /var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/mime > /dev/null 2>&1 &
     ;;
     download|search|policy|list|update|clean|show|depends|rdepends|changelog|moo)
     command=$1
@@ -360,6 +399,17 @@ case "$1" in
         amber-pm-debug amber-pm-dstore-patch
         amber-pm-gxde-desktop-fix
         ;;
+   launch)
+        shift
+        apm_launch "$@"
+        exit_code=$?
+        if [ $exit_code -eq 0 ]; then
+            log.info "Operation successful"
+        else
+            log.error "Error: Operation failed"
+            exit $exit_code
+        fi
+        ;;
    run)
         # 运行包命令：第二个参数必须是包名
         if [ -z "$2" ]; then
@@ -393,9 +443,11 @@ case "$1" in
             log.info "Running user command: $*"
             apm_exec "$@"
         else
-            # 没有额外参数：提示
-            log.info "Usage: $SCRIPT_NAME run $pkg [EXEC_PATH]"
-            exit 1
+            # 没有额外参数：提示用户改用 launch，并自动调用 launch
+            log.info "未指定可执行文件路径。如果希望在未指定容器路径的情况下启动应用程序，推荐使用 "launch" 命令"
+            log.info "正在启动：$SCRIPT_NAME launch $pkg"
+            apm_launch "$pkg"
+            exit $?
         fi
         ;;
    sandbox-run)
@@ -415,6 +467,7 @@ case "$1" in
         debug_info $@
         ;;
     ssaudit)
+        amber-pm-debug dpkg --configure -a
         amber-pm-debug ssaudit $@ --native
         exit_code=$?
     if [ $exit_code -eq 0 ]; then

src/usr/share/bash-completion/completions/apm

@@ -37,6 +37,7 @@ _apm()
     # see if the user selected a command already
     local COMMANDS=(
         "ssaudit"
+        "launch"
         "list"
         "search"
         "show" "showsrc"
@@ -185,7 +186,7 @@ find_directories_without_ace_env() {
     # 查找所有直接子目录，排除包含ace-env子目录的目录
     while IFS= read -r -d '' dir; do
         if [[ -d "$dir" ]] && [[ ! -d "$dir/files/ace-env" ]]; then
-            result+=("$(basename $dir)")
+            result+=("$(basename "$dir")")
         fi
     done < <(find "$base_dir" -maxdepth 1 -type d ! -path "$base_dir" -print0 2>/dev/null)
     
@@ -196,52 +197,107 @@ find_directories_without_ace_env() {
     fi
     return 1
 }
-function apm_run_compgen(){
-result=$(find_directories_without_ace_env "$primary_dir")
 
-if [[ -n "$result" ]]; then
+function apm_run_compgen(){
+    result=$(find_directories_without_ace_env "$primary_dir")
+
+    if [[ -n "$result" ]]; then
         echo "$result"
-else
+    else
         result=$(find_directories_without_ace_env "$fallback_dir")
         if [[ -n "$result" ]]; then
             echo "$result"
         else
             echo ""
         fi
-fi
+    fi
 }
+
+# 获取当前命令的参数位置
+get_arg_position() {
+    local cmd="$1"
+    local pos=0
+    local found_cmd=0
+    
+    for (( i=1; i < ${#words[@]}; i++ )); do
+        if [[ $found_cmd -eq 0 ]]; then
+            if [[ "${words[i]}" == "$cmd" ]]; then
+                found_cmd=1
+            fi
+        else
+            # 跳过选项参数（以-开头）
+            if [[ "${words[i]}" != -* ]]; then
+                ((pos++))
+            fi
+        fi
+    done
+    echo $pos
+}
+
     # specific command arguments
     if [[ -n $command ]]; then
+        # 获取参数位置
+        local arg_pos=$(get_arg_position "$command")
+        
         case $command in
             remove|purge|autoremove)
-                    # Debian system
-
-
-                    COMPREPLY=( $( compgen -W "$(ls /var/lib/apm/apm/files/ace-env/var/lib/apm/ )" $cur ) )
-
+                # 第一个参数匹配包名
+                if [[ $arg_pos -eq 1 ]]; then
+                    COMPREPLY=( $( compgen -W "$(ls /var/lib/apm/apm/files/ace-env/var/lib/apm/ )" "$cur" ) )
+                fi
                 return 0
                 ;;
             show|list|download|changelog|depends|rdepends)
+                # 第一个参数匹配包名
+                if [[ $arg_pos -eq 1 ]]; then
                     COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/"  \
                         2> /dev/null ) )
+                fi
                 return 0
                 ;;
             install)
+                # 第一个参数匹配包名
+                if [[ $arg_pos -eq 1 ]]; then
                     COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/"  \
                         2> /dev/null ) )
                     if [[ "$cur" == ./* || "$cur" == /* ]]; then
                         _filedir "deb"
                     fi
+                fi
                 return 0
                 ;;
             source|build-dep|showsrc|policy)
+                # 第一个参数匹配包名
+                if [[ $arg_pos -eq 1 ]]; then
                     COMPREPLY=( $( amber-pm-debug apt-cache --no-generate pkgnames "$cur" -o Dir::Cache="/var/lib/aptss/"  \
                         2> /dev/null ) $( apt-cache dumpavail -o Dir::Cache="/var/lib/aptss/"  | \
                         command grep "^Source: $cur" | sort -u | cut -f2 -d" " ) )
+                fi
                 return 0
                 ;;
             run|sandbox-run|bwrap-run)
+                # 第一个参数匹配包名
+                if [[ $arg_pos -eq 1 ]]; then
                     COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) )
+                # 第二个及以后参数匹配文件
+                elif [[ $arg_pos -ge 2 ]]; then
+                    _filedir
+                fi
+                return 0
+                ;;
+            launch)
+                # 第一个参数匹配包名
+                if [[ $arg_pos -eq 1 ]]; then
+                    COMPREPLY=( $( compgen -W "$(apm_run_compgen)" "$cur" ) )
+                # 第二个及以后参数匹配文件
+                elif [[ $arg_pos -ge 2 ]]; then
+                    _filedir
+                fi
+                return 0
+                ;;
+            ssaudit)
+                # ssaudit 命令总是匹配文件
+                _filedir
                 return 0
                 ;;
         esac

src/usr/share/polkit-1/actions/store.spark-app.apm-uninstaller.policy

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+    <vendor>Flamescion</vendor>
+    <icon_name>x-package-repository</icon_name>
+    <action id="store.spark-app.apm-uninstaller">
+        <description>运行justinstallme需要权限</description>
+        <message>要使用ssinstall需要权限</message>
+        <defaults>
+            <allow_any>yes</allow_any>
+            <allow_inactive>yes</allow_inactive>
+            <allow_active>yes</allow_active>
+        </defaults>
+        <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/amber-pm-app-uninstaller</annotate>
+        <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+    </action>
+</policyconfig>

src/var/lib/apm/apm/files/ace-run

@@ -61,7 +61,7 @@ fi
 #########################################################################################
 ##########合成bwrap 1. 基础函数配置段
 # 初始化 EXEC_COMMAND 为 bwrap 基础指令
-EXEC_COMMAND="bwrap --dev-bind / / bwrap"
+EXEC_COMMAND="bwrap"
 
 # add_command 函数定义
 function add_command() {
@@ -150,12 +150,11 @@ NON_SANDBOX_BIND_DIRS=(
 )
 
 # 根据 APM_USE_BWRAP 决定是否添加 CAP_SYS_ADMIN
-EXTRA_ARGS=()
-if [ "${APM_USE_BWRAP:-0}" != "1" ]; then
-    EXTRA_ARGS=(
-        "--cap-add CAP_SYS_ADMIN"
-    )
-fi
+
+#    EXTRA_ARGS=(
+#        "--unshare-user-try"
+#    )
+
 
 EXTRA_SCRIPTS=(
 #    cursor_theme_dir_integration

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

@@ -114,7 +114,8 @@ 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  
+ln -sfv ../../usr/share/mime/   $chrootEnvPath/amber-ce-tools/data-dir/
 
 chmod 777 -R $chrootEnvPath/usr/share/icons
 rm -vfr $chrootEnvPath/dev/*

src/var/lib/apm/apm/files/bin/amber-ce-configure-nvidia

@@ -1,81 +1,718 @@
 #!/bin/bash
+
+# 日志函数
 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"; }
 
-if [ "$UID" != "0" ];then
-log.error "需要以root权限运行 Need to be run as root."
-exit 1
-fi
-
-if [ -z "$1" ];then
-log.error "需要把ace-env所在的路径设置为第一个参数"
-exit 1
-fi
-
-# 1. 获取宿主机 NVIDIA 驱动版本
-nvidia_version=$(cat /sys/module/nvidia/version 2>/dev/null)
-if [ -z "$nvidia_version" ]; then
-#    log.warn "无法获取 NVIDIA 驱动版本 Can not determine NVIDIA Driver version"
+# 检查权限
+if [ "$UID" != "0" ]; then
+    log.error "需要以root权限运行 Need to be run as root."
     exit 1
 fi
 
-# 2. 目标目录准备
-ACE_DIR="$1"
-if [[ ! -e "${ACE_DIR}" ]];then
-log.error "未检测到 apm安装，请安装后再试 apm is not detected. Please try again after installation"
-exit 1
+# 检查参数
+if [ -z "$1" ]; then
+    log.error "需要把ace-env所在的路径设置为第一个参数"
+    exit 1
 fi
-mkdir -p "$ACE_DIR/usr/lib" "$ACE_DIR/usr/lib32"
 
-# 检查版本是否已存在且匹配
-if [ -f "$ACE_DIR/current_version" ]; then
-    existing_version=$(cat "$ACE_DIR/current_version")
+# 辅助函数
+trim() {
+    local str="$1"
+    str="${str#"${str%%[![:space:]]*}"}"  # 移除前导空格
+    str="${str%"${str##*[![:space:]]}"}"  # 移除尾部空格
+    echo "$str"
+}
+
+is_regular_or_symlink() {
+    local path="$1"
+    if [ -f "$path" ] || [ -L "$path" ]; then
+        return 0
+    fi
+    return 1
+}
+
+is_directory() {
+    local path="$1"
+    if [ -d "$path" ]; then
+        return 0
+    fi
+    return 1
+}
+
+is_char_or_block_device() {
+    local path="$1"
+    if [ -c "$path" ] || [ -b "$path" ]; then
+        return 0
+    fi
+    return 1
+}
+
+read_driver_version() {
+    # 尝试从/sys目录读取
+    if [ -f "/sys/module/nvidia/version" ]; then
+        local version=$(cat "/sys/module/nvidia/version" 2>/dev/null)
+        version=$(trim "$version")
+        if [ -n "$version" ]; then
+            echo "$version"
+            return 0
+        fi
+    fi
+    
+    # 尝试从/proc目录读取
+    if [ -f "/proc/driver/nvidia/version" ]; then
+        local proc_version=$(cat "/proc/driver/nvidia/version" 2>/dev/null)
+        # 提取版本号 (格式: 535.86.05)
+        if [[ "$proc_version" =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
+            echo "${BASH_REMATCH[0]}"
+            return 0
+        fi
+    fi
+    
+    return 1
+}
+
+version_from_filename() {
+    local filename="$1"
+    local prefix="$2"
+    
+    if [[ "$filename" != "$prefix"* ]]; then
+        return 1
+    fi
+    
+    local version="${filename#$prefix}"
+    if [[ -z "$version" ]]; then
+        return 1
+    fi
+    
+    echo "$version"
+    return 0
+}
+
+compare_versions() {
+    local ver1="$1"
+    local ver2="$2"
+    
+    # 分割版本号
+    IFS='.' read -r -a v1_parts <<< "$ver1"
+    IFS='.' read -r -a v2_parts <<< "$ver2"
+    
+    local max_len=$(( ${#v1_parts[@]} > ${#v2_parts[@]} ? ${#v1_parts[@]} : ${#v2_parts[@]} ))
+    
+    for ((i=0; i<max_len; i++)); do
+        local v1=${v1_parts[i]:-0}
+        local v2=${v2_parts[i]:-0}
+        
+        if (( v1 < v2 )); then
+            echo "-1"
+            return
+        elif (( v1 > v2 )); then
+            echo "1"
+            return
+        fi
+    done
+    
+    echo "0"
+}
+
+collect_files() {
+    local search_dirs=("${!1}")
+    local pattern="$2"
+    local results=()
+    
+    for dir in "${search_dirs[@]}"; do
+        if [ ! -d "$dir" ]; then
+            continue
+        fi
+        
+        # 使用find搜索文件
+        while IFS= read -r -d '' file; do
+            if is_regular_or_symlink "$file"; then
+                results+=("$file")
+            fi
+        done < <(find "$dir" -name "$pattern" -type f 2>/dev/null | head -100)
+    done
+    
+    # 去重
+    local unique_results=()
+    declare -A seen
+    for file in "${results[@]}"; do
+        local realpath=$(readlink -f "$file" 2>/dev/null || echo "$file")
+        if [ -z "${seen[$realpath]}" ]; then
+            seen["$realpath"]=1
+            unique_results+=("$realpath")
+        fi
+    done
+    
+    echo "${unique_results[@]}"
+}
+
+select_best_versioned_lib() {
+    local files=("${!1}")
+    local prefix="$2"
+    local prefer_version="$3"
+    
+    local best=""
+    local best_version=""
+    
+    for file in "${files[@]}"; do
+        local filename=$(basename "$file")
+        
+        # 提取版本号
+        local version_result=$(version_from_filename "$filename" "$prefix")
+        if [ -z "$version_result" ]; then
+            continue
+        fi
+        
+        local version="$version_result"
+        
+        # 如果指定了首选版本，优先匹配
+        if [ -n "$prefer_version" ] && [ "$version" != "$prefer_version" ]; then
+            continue
+        fi
+        
+        if [ -z "$best" ] || [ "$(compare_versions "$version" "$best_version")" -gt 0 ]; then
+            best="$file"
+            best_version="$version"
+        fi
+    done
+    
+    # 如果没有匹配到首选版本，选择最高版本
+    if [ -z "$best" ] && [ -n "$prefer_version" ]; then
+        for file in "${files[@]}"; do
+            local filename=$(basename "$file")
+            local version_result=$(version_from_filename "$filename" "$prefix")
+            if [ -z "$version_result" ]; then
+                continue
+            fi
+            
+            local version="$version_result"
+            
+            if [ -z "$best" ] || [ "$(compare_versions "$version" "$best_version")" -gt 0 ]; then
+                best="$file"
+                best_version="$version"
+            fi
+        done
+    fi
+    
+    echo "$best"
+}
+
+detect_driver_info() {
+    local info=""
+    
+    # 读取驱动版本
+    local driver_version=$(read_driver_version)
+    if [ -z "$driver_version" ]; then
+        driver_version=""
+    fi
+    
+    # 默认库搜索路径
+    local default_search_paths=(
+        "/usr/lib64"
+        "/usr/lib/x86_64-linux-gnu"
+        "/usr/lib/i386-linux-gnu"
+        "/usr/lib/aarch64-linux-gnu"
+        "/usr/lib/x86_64-linux-gnu/nvidia/current"
+        "/usr/lib/i386-linux-gnu/nvidia/current"
+        "/usr/lib/aarch64-linux-gnu/nvidia/current"
+        "/lib64"
+        "/lib/x86_64-linux-gnu"
+        "/lib/i386-linux-gnu"
+        "/lib/aarch64-linux-gnu"
+        "/lib/x86_64-linux-gnu/nvidia/current"
+        "/lib/i386-linux-gnu/nvidia/current"
+        "/lib/aarch64-linux-gnu/nvidia/current"
+        "/usr/lib"
+        "/lib"
+    )
+    
+    # 搜索libcuda.so
+    local cuda_files=($(collect_files default_search_paths[@] "libcuda.so.*"))
+    local nvidia_ml_files=($(collect_files default_search_paths[@] "libnvidia-ml.so.*"))
+    
+    local selected_lib=""
+    
+    if [ ${#cuda_files[@]} -gt 0 ]; then
+        selected_lib=$(select_best_versioned_lib cuda_files[@] "libcuda.so." "$driver_version")
+    fi
+    
+    if [ -z "$selected_lib" ] && [ ${#nvidia_ml_files[@]} -gt 0 ]; then
+        selected_lib=$(select_best_versioned_lib nvidia_ml_files[@] "libnvidia-ml.so." "$driver_version")
+    fi
+    
+    local lib_dir=""
+    if [ -n "$selected_lib" ]; then
+        lib_dir=$(dirname "$selected_lib")
+        
+        # 如果还没有驱动版本，从文件名提取
+        if [ -z "$driver_version" ]; then
+            local filename=$(basename "$selected_lib")
+            local cuda_version=$(version_from_filename "$filename" "libcuda.so.")
+            local ml_version=$(version_from_filename "$filename" "libnvidia-ml.so.")
+            
+            if [ -n "$cuda_version" ]; then
+                driver_version="$cuda_version"
+            elif [ -n "$ml_version" ]; then
+                driver_version="$ml_version"
+            fi
+        fi
+    fi
+    
+    # 如果还没找到库目录，使用默认的
+    if [ -z "$lib_dir" ]; then
+        for path in "${default_search_paths[@]}"; do
+            if is_directory "$path"; then
+                lib_dir="$path"
+                break
+            fi
+        done
+    fi
+    
+    echo "$driver_version:$lib_dir"
+}
+
+read_elf_soname() {
+    local file="$1"
+    
+    # 使用readelf读取SONAME
+    if command -v readelf >/dev/null 2>&1; then
+        local soname=$(readelf -d "$file" 2>/dev/null | grep -E "SONAME.*\[.*\]" | sed -E 's/.*\[(.*)\].*/\1/')
+        if [ -n "$soname" ]; then
+            echo "$soname"
+            return 0
+        fi
+    fi
+    
+    # 使用objdump作为备选
+    if command -v objdump >/dev/null 2>&1; then
+        local soname=$(objdump -p "$file" 2>/dev/null | grep -E "SONAME" | awk '{print $2}')
+        if [ -n "$soname" ]; then
+            echo "$soname"
+            return 0
+        fi
+    fi
+    
+    return 1
+}
+
+is_elf32() {
+    local file="$1"
+    
+    if ! [ -f "$file" ]; then
+        return 1
+    fi
+    
+    # 检查文件头部
+    local header=$(head -c 5 "$file" 2>/dev/null | od -An -t x1 | tr -d ' \n')
+    
+    # ELF魔法字节: 7f 45 4c 46
+    if [[ "$header" == 7f454c46* ]]; then
+        # 检查第5个字节：01表示32位，02表示64位
+        local class_byte=${header:8:2}
+        if [ "$class_byte" = "01" ]; then
+            return 0
+        fi
+    fi
+    
+    return 1
+}
+
+ensure_symlink() {
+    local target="$1"
+    local link_path="$2"
+    
+    # 创建父目录
+    mkdir -p "$(dirname "$link_path")" 2>/dev/null
+    
+    # 如果链接已存在且正确，跳过
+    if [ -L "$link_path" ]; then
+        local current_target=$(readlink -f "$link_path" 2>/dev/null || readlink "$link_path")
+        if [ "$current_target" = "$target" ]; then
+            return 0
+        fi
+    fi
+    
+    # 删除现有文件/链接
+    rm -f "$link_path" 2>/dev/null
+    
+    # 创建符号链接
+    ln -sf "$target" "$link_path" 2>/dev/null
+    return $?
+}
+
+# 主函数
+main() {
+    ACE_DIR="$1"
+    
+    # 检查目标目录
+    if [[ ! -e "${ACE_DIR}" ]]; then
+        log.error "ACE_DIR为空，退出。"
+        exit 1
+    fi
+    
+    # 获取驱动信息
+    local driver_info=$(detect_driver_info)
+    if [ -z "$driver_info" ]; then
+#        log.error "无法检测到NVIDIA驱动信息 Cannot detect NVIDIA driver information"
+        exit 
+    fi
+    
+    local nvidia_version=$(echo "$driver_info" | cut -d':' -f1)
+    local lib_dir=$(echo "$driver_info" | cut -d':' -f2)
+    
+    if [ -z "$nvidia_version" ]; then
+#        log.error "无法获取NVIDIA驱动版本 Cannot determine NVIDIA driver version"
+        exit 
+    fi
+    
+    # 检查版本是否已存在且匹配
+    if [ -f "$ACE_DIR/amber-ce-tools/nvidia_current_version" ]; then
+        local existing_version=$(cat "$ACE_DIR/amber-ce-tools/nvidia_current_version")
         if [ "$existing_version" = "$nvidia_version" ]; then
-#        log.info "NVIDIA 驱动版本未变化，跳过链接操作 NVIDIA Driver version unchanged, skipping linking."
+#            log.info "NVIDIA驱动版本未变化，跳过链接操作 NVIDIA Driver version unchanged, skipping linking."
             exit 0
         else
-        log.info "检测到 NVIDIA 驱动版本变化: $existing_version -> $nvidia_version"
-        log.info "NVIDIA Driver version changed: $existing_version -> $nvidia_version"
+            log.info "检测到NVIDIA驱动版本变化: $existing_version -> $nvidia_version"
+        fi
     fi
-fi
     
-log.info "正在链接 NVIDIA 驱动库 Linking NVIDIA Driver Libs"
+    log.info "正在链接NVIDIA驱动库和GLX组件 Linking NVIDIA Driver Libs and GLX components"
     
-# 3. 收集库文件路径
-lib_list=$(ldconfig -p | grep -Ei "nvidia|libcuda" | cut -d'>' -f2)
+    # 准备目录结构
+    mkdir -p "$ACE_DIR/usr/lib" "$ACE_DIR/usr/lib32"
+    mkdir -p "$ACE_DIR/orig" "$ACE_DIR/orig/32"
+    mkdir -p "$ACE_DIR/etc"
     
-# 4. 复制库文件
-copied=0
-for lib in $lib_list; do
-    resolved=$(readlink -f "$lib") # 解析符号链接
-    if file "$resolved" | grep -q "32-bit"; then
-        ln -sf "/host/$resolved" "$ACE_DIR/usr/lib32/$(basename $lib)"
+    # 清理旧链接
+#    find "$ACE_DIR/usr/lib" -type l -name "*.so*" -delete 2>/dev/null
+#    find "$ACE_DIR/usr/lib32" -type l -name "*.so*" -delete 2>/dev/null
+#    find "$ACE_DIR/orig" -type l -name "*.so*" -delete 2>/dev/null
+#    find "$ACE_DIR/orig/32" -type l -name "*.so*" -delete 2>/dev/null
+    
+    # 默认库搜索路径
+    local default_search_paths=(
+        "$lib_dir"
+        "/usr/lib64"
+        "/usr/lib/x86_64-linux-gnu"
+        "/usr/lib/i386-linux-gnu"
+        "/usr/lib/aarch64-linux-gnu"
+        "/usr/lib/x86_64-linux-gnu/nvidia/current"
+        "/usr/lib/i386-linux-gnu/nvidia/current"
+        "/usr/lib/aarch64-linux-gnu/nvidia/current"
+        "/lib64"
+        "/lib/x86_64-linux-gnu"
+        "/lib/i386-linux-gnu"
+        "/lib/aarch64-linux-gnu"
+        "/lib/x86_64-linux-gnu/nvidia/current"
+        "/lib/i386-linux-gnu/nvidia/current"
+        "/lib/aarch64-linux-gnu/nvidia/current"
+        "/usr/lib"
+        "/lib"
+    )
+    
+    # 1. 首先收集核心NVIDIA库
+    log.debug "收集核心NVIDIA库..."
+    
+    # 核心库列表
+    local core_libs=(
+        "libnvidia-ml.so.*"
+        "libcuda.so.*"
+        "libnvidia-ptxjitcompiler.so.*"
+        "libnvidia-fatbinaryloader.so.*"
+        "libnvidia-opencl.so.*"
+        "libnvidia-compiler.so.*"
+        "libnvidia-encode.so.*"
+        "libnvidia-opticalflow.so.*"
+        "libnvcuvid.so.*"
+        "libnvidia-cfg.so.*"
+        "libnvidia-allocator.so.*"
+        "libnvidia-nvvm.so.*"
+    )
+    
+    # 2. 收集图形库（包含GLX）
+    log.debug "收集图形库..."
+    local graphics_libs=(
+        "libGLX_nvidia.so.*"
+        "libEGL_nvidia.so.*"
+        "libGLESv1_CM_nvidia.so.*"
+        "libGLESv2_nvidia.so.*"
+        "libnvidia-glcore.so.*"
+        "libnvidia-glsi.so.*"
+        "libnvidia-tls.so.*"
+        "libnvidia-egl-gbm.so.*"
+        "libnvidia-egl-wayland.so.*"
+        "libnvidia-vulkan-producer.so.*"
+        "libEGL.so*"
+        "libGL.so*"
+        "libGLESv1_CM.so*"
+        "libGLESv2.so*"
+        "libGLX.so*"
+        "libGLdispatch.so*"
+        "libOpenCL.so*"
+        "libOpenGL.so*"
+        "libnvidia-api.so*"
+        "libnvidia-egl-xcb.so*"
+        "libnvidia-egl-xlib.so*"
+    )
+    
+    # 收集所有库文件
+    local all_libs=()
+    
+    for pattern in "${core_libs[@]}" "${graphics_libs[@]}"; do
+        local files=($(collect_files default_search_paths[@] "$pattern"))
+        all_libs+=("${files[@]}")
+    done
+    
+    # 去重
+    declare -A seen_libs
+    local unique_libs=()
+    for lib in "${all_libs[@]}"; do
+        local realpath=$(readlink -f "$lib" 2>/dev/null || echo "$lib")
+        if [ -z "${seen_libs[$realpath]}" ]; then
+            seen_libs["$realpath"]=1
+            unique_libs+=("$realpath")
+        fi
+    done
+    
+    # 创建链接
+    local has_32bit=false
+    local has_64bit=false
+    local has_glx=false
+    
+    for lib_path in "${unique_libs[@]}"; do
+        if [ ! -f "$lib_path" ] && [ ! -L "$lib_path" ]; then
+            continue
+        fi
+        
+        local filename=$(basename "$lib_path")
+        local is_32bit=false
+        
+        # 检查是否是32位库
+        if is_elf32 "$lib_path"; then
+            is_32bit=true
+            has_32bit=true
         else
-        ln -sf "/host/$resolved" "$ACE_DIR/usr/lib/$(basename $lib)"
-        copied=1
+            has_64bit=true
         fi
-done
         
-# 5. 复制辅助文件
-additional_files=(
-    /usr/share/vulkan/icd.d/nvidia_icd.json
-    /usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json
-)
-for file in "${additional_files[@]}"; do
+        # 创建原始链接（容器内路径）
+        local orig_dest_dir="$ACE_DIR/orig"
+        if [ "$is_32bit" = true ]; then
+            orig_dest_dir="$ACE_DIR/orig/32"
+        fi
+        
+        # 创建主链接
+        local container_target="/host$lib_path"
+        local orig_link_path="$orig_dest_dir/$filename"
+        
+        if ensure_symlink "$container_target" "$orig_link_path"; then
+            # 检查是否是GLX库
+            if [[ "$filename" == libGLX_nvidia.so.* ]]; then
+                has_glx=true
+            fi
+            
+            # 创建SONAME链接
+            local soname=$(read_elf_soname "$lib_path")
+            if [ -n "$soname" ] && [ "$soname" != "$filename" ]; then
+                local soname_link_path="$orig_dest_dir/$soname"
+                ensure_symlink "$container_target" "$soname_link_path"
+            fi
+        fi
+    done
+    
+    # 3. 收集X.Org模块
+    log.debug "收集X.Org模块..."
+    local xorg_paths=(
+        "$lib_dir/nvidia/xorg"
+        "$lib_dir/xorg/modules/drivers"
+        "$lib_dir/xorg/modules/extensions"
+        "$lib_dir/xorg/modules/updates/drivers"
+        "$lib_dir/xorg/modules/updates/extensions"
+        "/usr/lib/xorg/modules/drivers"
+        "/usr/lib/xorg/modules/extensions"
+        "/usr/lib/xorg/modules/updates/drivers"
+        "/usr/lib/xorg/modules/updates/extensions"
+        "/usr/lib64/xorg/modules/drivers"
+        "/usr/lib64/xorg/modules/extensions"
+        "/usr/lib64/xorg/modules/updates/drivers"
+        "/usr/lib64/xorg/modules/updates/extensions"
+    )
+    
+    # 查找X.Org驱动程序
+    local xorg_driver=""
+    for xorg_dir in "${xorg_paths[@]}"; do
+        if [ -f "$xorg_dir/nvidia_drv.so" ]; then
+            xorg_driver="$xorg_dir/nvidia_drv.so"
+            break
+        fi
+    done
+    
+    # 查找GLX服务器模块
+    local glx_server=""
+    for xorg_dir in "${xorg_paths[@]}"; do
+        if [ -f "$xorg_dir/libglxserver_nvidia.so.$nvidia_version" ]; then
+            glx_server="$xorg_dir/libglxserver_nvidia.so.$nvidia_version"
+            break
+        fi
+    done
+    
+    # 如果没有找到特定版本，尝试通配符
+    if [ -z "$glx_server" ]; then
+        for xorg_dir in "${xorg_paths[@]}"; do
+            local found=$(find "$xorg_dir" -name "libglxserver_nvidia.so.*" -type f 2>/dev/null | head -1)
+            if [ -n "$found" ]; then
+                glx_server="$found"
+                break
+            fi
+        done
+    fi
+    
+    # 创建X.Org文件链接
+    if [ -n "$xorg_driver" ]; then
+        local dest_dir="$ACE_DIR$(dirname "$xorg_driver")"
+        mkdir -p "$dest_dir"
+        local container_target="/host$xorg_driver"
+        ensure_symlink "$container_target" "$dest_dir/$(basename "$xorg_driver")"
+    fi
+    
+    if [ -n "$glx_server" ]; then
+        has_glx=true
+        local dest_dir="$ACE_DIR$(dirname "$glx_server")"
+        mkdir -p "$dest_dir"
+        local container_target="/host$glx_server"
+        ensure_symlink "$container_target" "$dest_dir/$(basename "$glx_server")"
+    fi
+    
+    # 4. 复制配置文件和辅助文件
+    log.debug "处理配置和辅助文件..."
+    
+    # Vulkan配置文件
+    local vulkan_files=(
+        "/usr/share/vulkan/icd.d/nvidia_icd.json"
+        "/usr/share/vulkan/icd.d/nvidia_icd.x86_64.json"
+        "/usr/share/vulkan/icd.d/nvidia_icd.aarch64.json"
+        "/usr/share/vulkan/implicit_layer.d/nvidia_layers.json"
+    )
+    
+    # EGL配置文件
+    local egl_files=(
+        "/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json"
+        "/usr/share/egl/egl_external_platform.d/15_nvidia_gbm.json"
+        "/usr/share/egl/egl_external_platform.d/20_nvidia_xcb.json"
+    )
+    
+    # GLVND配置文件
+    local glvnd_files=(
+        "/usr/share/glvnd/egl_vendor.d/10_nvidia.json"
+    )
+    
+    # X11配置文件
+    local x11_files=(
+        "/usr/share/X11/xorg.conf.d/10-nvidia.conf"
+        "/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf"
+    )
+    
+    # 处理所有配置文件
+    for file in "${vulkan_files[@]}" "${egl_files[@]}" "${glvnd_files[@]}" "${x11_files[@]}"; do
         if [ -f "$file" ]; then
-        file=$(readlink -f "$file")
-        dir=$(dirname "$file")
-        mkdir -p "$ACE_DIR/$dir"
-        ln -sf "/host/$file" "$ACE_DIR/$dir"
+            local dest_dir="$ACE_DIR$(dirname "$file")"
+            mkdir -p "$dest_dir"
+            local container_target="/host$file"
+            ensure_symlink "$container_target" "$dest_dir/$(basename "$file")"
+        fi
+    done
+    
+    # 5. 生成ld.so.conf文件
+    if [ "$has_64bit" = true ] || [ "$has_32bit" = true ]; then
+        echo "/opt/extensions/nvidia/orig" > "$ACE_DIR/etc/ld.so.conf"
+        if [ "$has_32bit" = true ]; then
+            echo "/opt/extensions/nvidia/orig/32" >> "$ACE_DIR/etc/ld.so.conf"
+        fi
+    fi
+    
+    # 6. 标记版本
+    echo "$nvidia_version" > "$ACE_DIR/amber-ce-tools/nvidia_current_version"
+    
+    # 7. 生成环境变量脚本
+    cat > "$ACE_DIR/nvidia_env.sh" << EOF
+#!/bin/bash
+# NVIDIA驱动环境变量
+
+export NVIDIA_DRIVER_VERSION="$nvidia_version"
+
+# 库路径
+if [ -d "/opt/extensions/nvidia/orig" ]; then
+    export LD_LIBRARY_PATH="/opt/extensions/nvidia/orig:\${LD_LIBRARY_PATH}"
+fi
+if [ -d "/opt/extensions/nvidia/orig/32" ]; then
+    export LD_LIBRARY_PATH="/opt/extensions/nvidia/orig/32:\${LD_LIBRARY_PATH}"
+fi
+
+# GLX和EGL配置
+if [ "$has_glx" = true ]; then
+    export __GLX_VENDOR_LIBRARY_NAME="nvidia"
+    export __NV_PRIME_RENDER_OFFLOAD="1"
+fi
+
+# Vulkan ICD文件
+if [ -f "/opt/extensions/nvidia/usr/share/vulkan/icd.d/nvidia_icd.json" ]; then
+    export VK_ICD_FILENAMES="/opt/extensions/nvidia/usr/share/vulkan/icd.d/nvidia_icd.json"
+    export VK_ADD_DRIVER_FILES="\${VK_ICD_FILENAMES}"
+fi
+
+# EGL外部平台配置
+EGL_CONF_DIRS=""
+for dir in /opt/extensions/nvidia/usr/share/egl/egl_external_platform.d \
+           /usr/share/egl/egl_external_platform.d; do
+    if [ -d "\$dir" ]; then
+        EGL_CONF_DIRS="\$dir:\${EGL_CONF_DIRS}"
     fi
 done
-
-# 6. 标记版本
-if [ $copied -eq 1 ]; then
-    echo "$nvidia_version" > "$ACE_DIR/current_version"
-    log.info "NVIDIA 驱动库已成功链接 Nvidia Driver Libs are successfully linked. "
-else
-    log.info "未找到有效 NVIDIA 库文件 No valid NVIDIA Driver Libs found."
+if [ -n "\${EGL_CONF_DIRS}" ]; then
+    export EGL_EXTERNAL_PLATFORM_CONFIG_DIRS="\${EGL_CONF_DIRS%:}"
+    export __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS="\${EGL_CONF_DIRS%:}"
 fi
+
+# EGL供应商库目录
+EGL_VENDOR_DIRS=""
+for dir in /opt/extensions/nvidia/usr/share/glvnd/egl_vendor.d \
+           /usr/share/glvnd/egl_vendor.d; do
+    if [ -d "\$dir" ]; then
+        EGL_VENDOR_DIRS="\$dir:\${EGL_VENDOR_DIRS}"
+    fi
+done
+if [ -n "\${EGL_VENDOR_DIRS}" ]; then
+    export __EGL_VENDOR_LIBRARY_DIRS="\${EGL_VENDOR_DIRS%:}"
+fi
+
+export NVIDIA_CTK_LIBCUDA_DIR="/opt/extensions/nvidia/orig"
+
+EOF
+    
+    chmod +x "$ACE_DIR/nvidia_env.sh"
+    
+    log.info "NVIDIA驱动库和GLX组件已成功链接 Nvidia Driver Libs and GLX components are successfully linked."
+    log.info "驱动版本: $nvidia_version"
+    log.info "64位库: $has_64bit, 32位库: $has_32bit, GLX支持: $has_glx"
+    log.info "环境变量脚本已生成: $ACE_DIR/nvidia_env.sh"
+    
+    # 创建设备节点信息文件（供容器运行时使用）
+    cat > "$ACE_DIR/devices.info" << EOF
+# NVIDIA设备节点
+/dev/nvidiactl
+/dev/nvidia-uvm
+/dev/nvidia-uvm-tools
+/dev/nvidia-modeset
+/dev/nvidia[0-9]*
+/dev/dri/card*
+/dev/dri/renderD*
+EOF
+    
+    exit 0
+}
+
+# 执行主函数
+main "$1"