spark-store-project/amber-pm
15
0
Fork 0
mirror of https://gitee.com/amber-ce/amber-pm synced 2026-03-26 15:39:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

更改spec以和实际一致

Browse Source
This commit is contained in:
shenmo
2025-10-27 11:42:05 +08:00
parent 1c492b165d
commit c5fd74b513
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/usr/bin/amber-pm-convert
View File

@@ -116,7 +116,7 @@ trap cleanup EXIT
get_recursive_basenames() { get_recursive_basenames() {
local basename="$1" local basename="$1"
local base_dir="/var/lib/apm/apm/files/ace-env/var/lib/apm/$basename" local base_dir="/var/lib/apm/apm/files/ace-env/var/lib/apm/$basename"
local info_file="$base_dir/files/ace-env/info" local info_file="$base_dir/info"
if [ -f "$info_file" ]; then if [ -f "$info_file" ]; then
log.info "读取info文件: $info_file" log.info "读取info文件: $info_file"

14
src/usr/bin/apm
View File

@@ -42,7 +42,7 @@ EOF
apm_exec(){ apm_exec(){
# 递归读取info文件并构建lowerdir # 递归读取info文件并构建lowerdir
local lowerdirs=() local lowerdirs=()
local current_dir="${PATH_PREFIX}/var/lib/apm/${coredir}/files" # 当前目录开始 local current_dir="${PATH_PREFIX}/var/lib/apm/${coredir}" # 当前目录开始
local next_info_file="" local next_info_file=""
while : ; do while : ; do
@@ -60,11 +60,11 @@ apm_exec(){
[[ -z "$basedir" ]] && continue # 跳过空行 [[ -z "$basedir" ]] && continue # 跳过空行
# 检查ace-env目录是否存在 # 检查ace-env目录是否存在
if [[ -d "${current_dir}/${basedir}/files/ace-env" ]]; then if [[ -d "${PATH_PREFIX}/var/lib/apm/${basedir}/files/ace-env" ]]; then
lowerdirs+=("${current_dir}/${basedir}/files/ace-env") lowerdirs+=("${PATH_PREFIX}/var/lib/apm/${basedir}/files/ace-env")
# 如果ace-env不存在，检查core目录 # 如果ace-env不存在，检查core目录
elif [[ -d "${current_dir}/${basedir}/files/core" ]]; then elif [[ -d "${PATH_PREFIX}/var/lib/apm/${basedir}/files/core" ]]; then
lowerdirs+=("${current_dir}/${basedir}/files/core") lowerdirs+=("${PATH_PREFIX}/var/lib/apm/${basedir}/files/core")
else else
log.warn "Neither ace-env nor core directory found for base: $basedir" log.warn "Neither ace-env nor core directory found for base: $basedir"
fi fi
@@ -72,12 +72,12 @@ apm_exec(){
# 尝试获取下一个依赖信息的路径 # 尝试获取下一个依赖信息的路径
local next_basedir=$(tail -n 1 "$next_info_file") local next_basedir=$(tail -n 1 "$next_info_file")
if [[ -z "$next_basedir" || ! -d "${current_dir}/${next_basedir}/files" ]]; then if [[ -z "$next_basedir" || ! -d "${PATH_PREFIX}/var/lib/apm/${next_basedir}/files" ]]; then
log.debug "No further dependencies found, ending recursion." log.debug "No further dependencies found, ending recursion."
break break
fi fi
# 更新当前目录，递归处理下一个依赖 # 更新当前目录，递归处理下一个依赖
current_dir="${current_dir}/${next_basedir}/files" current_dir="${PATH_PREFIX}/var/lib/apm/${next_basedir}/files"
done done
# 检查是否找到了有效的lowerdir # 检查是否找到了有效的lowerdir