From e307c8e4ad099bb0c82dbda80f9b3a9fd4eeed23 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Mon, 27 Oct 2025 12:36:48 +0800
Subject: [PATCH] 1.0.10

---
 src/usr/bin/amber-pm-convert | 8 +++++---
 src/usr/bin/apm              | 9 ++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/usr/bin/amber-pm-convert b/src/usr/bin/amber-pm-convert
index 36832d7..7038f7d 100755
--- a/src/usr/bin/amber-pm-convert
+++ b/src/usr/bin/amber-pm-convert
@@ -41,6 +41,7 @@ while [ $# -gt 0 ]; do
     case $1 in
         --base)
             BASENAMES+=("$2")
+            BASENAMES_ORIG+=("$2")
             shift 2
             ;;
         --pkgname)
@@ -305,8 +306,9 @@ mkdir -p "$PKG_BUILD_DIR/var/lib/apm/$NEW_PKGNAME"/{entries,files}
 # 创建info文件 - 写入所有base，每行一个
 log.info "创建info文件，包含所有基础环境:"
 for BASENAME in "${BASENAMES[@]}"; do
-    echo "$BASENAME" >> "$PKG_BUILD_DIR/var/lib/apm/$NEW_PKGNAME/info"
-    log.info "  写入: $BASENAME"
+    echo "$BASENAME_ORIG" >> "$PKG_BUILD_DIR/var/lib/apm/$NEW_PKGNAME/info"
+    echo "$BASENAME" >> "$PKG_BUILD_DIR/var/lib/apm/$NEW_PKGNAME/info_debug"
+    log.info "  写入: $BASENAME_ORIG"
 done
 
 # 创建postinst脚本
@@ -372,7 +374,7 @@ Architecture: $ORIG_ARCH
 Maintainer: APM Converter <apm@localhost>
 Depends: $DEPENDS_STR
 Installed-Size: $(calculate_directory_size $PKG_BUILD_DIR)
-Description: APM converted package from $DEB_PATH
+Description: APM converted package from $ORIG_PKGNAME
   This package was automatically converted from the original deb package.
   Based on: ${BASENAMES[*]}
 EOF
diff --git a/src/usr/bin/apm b/src/usr/bin/apm
index 634c298..bfa1719 100755
--- a/src/usr/bin/apm
+++ b/src/usr/bin/apm
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=1.0.9
+VERSION=1.0.10
 # 获取脚本名称用于帮助信息
 SCRIPT_NAME=$(basename "$0")
 PATH_PREFIX=/var/lib/apm/apm/files/ace-env/
@@ -48,7 +48,7 @@ apm_exec(){
     while : ; do
         # 构建info文件的路径
         next_info_file="${current_dir}/info"
-
+        echo "${current_dir}/info"
         # 检查info文件是否存在
         if [[ ! -f "$next_info_file" ]]; then
             log.debug "No more info files found, stopping recursion."
@@ -72,12 +72,12 @@ apm_exec(){
 
         # 尝试获取下一个依赖信息的路径
         local next_basedir=$(tail -n 1 "$next_info_file")
-        if [[ -z "$next_basedir" || ! -d "${PATH_PREFIX}/var/lib/apm/${next_basedir}/files" ]]; then
+        if [[ -z "$next_basedir" || ! -d "${PATH_PREFIX}/var/lib/apm/${next_basedir}" ]]; then
             log.debug "No further dependencies found, ending recursion."
             break
         fi
         # 更新当前目录，递归处理下一个依赖
-        current_dir="${PATH_PREFIX}/var/lib/apm/${next_basedir}/files"
+        current_dir="${PATH_PREFIX}/var/lib/apm/${next_basedir}"
     done
     
     # 检查是否找到了有效的lowerdir
@@ -88,7 +88,6 @@ apm_exec(){
     
     # 将lowerdirs数组用冒号连接起来
     local lowerdir=$(IFS=:; echo "${lowerdirs[*]}")
-    
     # 创建挂载点目录
     mkdir -p "/tmp/apm/${coredir}"