spark-store-project/amber-pm
15
0
Fork 0
mirror of https://gitee.com/amber-ce/amber-pm synced 2026-05-14 02:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(打包工具): 更新维护者邮箱并优化addons包标记处理

Browse Source 
更新amber-pm-convert和amber-pm-addons-maker中的维护者邮箱
将addons标记文件直接打包而非通过postinst脚本创建，由dpkg统一管理
简化postrm脚本，移除手动删除标记文件的逻辑
This commit is contained in:
shenmo
2026-04-24 21:34:31 +08:00
parent f55dcc023d
commit be21417287
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/usr/bin/amber-pm-addons-maker
View File

@@ -325,23 +325,19 @@ sudo cp -r "$CRAFT_DIR"/core "$PKG_BUILD_DIR/var/lib/apm/${NEW_PKGNAME}/files/"
sudo cp -r "$CRAFT_DIR"/work "$PKG_BUILD_DIR/var/lib/apm/${NEW_PKGNAME}/files/" 2>/dev/null || true sudo cp -r "$CRAFT_DIR"/work "$PKG_BUILD_DIR/var/lib/apm/${NEW_PKGNAME}/files/" 2>/dev/null || true
sudo chmod -R 755 "$PKG_BUILD_DIR/var/lib/apm/${NEW_PKGNAME}/files/" 2>/dev/null || true sudo chmod -R 755 "$PKG_BUILD_DIR/var/lib/apm/${NEW_PKGNAME}/files/" 2>/dev/null || true
# 创建 postinst 脚本：安装时创建 info_layer_addons.d 标记 # 将 addons 标记文件直接放入包内，由 dpkg 统一管理
cat > "$PKG_BUILD_DIR/DEBIAN/postinst" << EOF # 安装时自动释放到 base 的 info_layer_addons.d/，卸载时自动清理
#!/bin/bash mkdir -p "$PKG_BUILD_DIR/var/lib/apm/${BASE_NAME}/info_layer_addons.d"
# 创建 addons 标记 echo "${NEW_PKGNAME}" > "$PKG_BUILD_DIR/var/lib/apm/${BASE_NAME}/info_layer_addons.d/50-${NEW_PKGNAME}"
mkdir -p /var/lib/apm/${BASE_NAME}/info_layer_addons.d
echo "${NEW_PKGNAME}" > /var/lib/apm/${BASE_NAME}/info_layer_addons.d/50-${NEW_PKGNAME}
EOF
chmod +x "$PKG_BUILD_DIR/DEBIAN/postinst"
# 创建 postrm 脚本：卸载时删除标记和包目录 # 创建 postrm 脚本：卸载时清理包目录和用户目录残留
# 注意：info_layer_addons.d 中的标记文件由 dpkg 自动删除，无需手动处理
cat > "$PKG_BUILD_DIR/DEBIAN/postrm" << EOF cat > "$PKG_BUILD_DIR/DEBIAN/postrm" << EOF
#!/bin/bash #!/bin/bash
PACKAGE_NAME="\$DPKG_MAINTSCRIPT_PACKAGE" PACKAGE_NAME="\$DPKG_MAINTSCRIPT_PACKAGE"
if [ "\$1" = "remove" ] || [ "\$1" = "purge" ]; then if [ "\$1" = "remove" ] || [ "\$1" = "purge" ]; then
echo "清理卸载残留" echo "清理卸载残留"
rm -f "/var/lib/apm/${BASE_NAME}/info_layer_addons.d/50-\${PACKAGE_NAME}"
rm -rf "/var/lib/apm/\${PACKAGE_NAME}" rm -rf "/var/lib/apm/\${PACKAGE_NAME}"
for username in \$(ls /home); do for username in \$(ls /home); do
if [ -d "/home/\${username}/.apm/\${PACKAGE_NAME}" ]; then if [ -d "/home/\${username}/.apm/\${PACKAGE_NAME}" ]; then
@@ -373,7 +369,7 @@ cat > "${PKG_BUILD_DIR}/DEBIAN/control" << EOF
Package: $NEW_PKGNAME Package: $NEW_PKGNAME
Version: $NEW_VERSION Version: $NEW_VERSION
Architecture: $ORIG_ARCH Architecture: $ORIG_ARCH
Maintainer: APM Addons Maker <apm-addons@spark-app.store> Maintainer: APM Addons Maker <shenmo@spark-app.store>
Depends: $BASE_NAME Depends: $BASE_NAME
Installed-Size: $(calculate_directory_size "$PKG_BUILD_DIR") Installed-Size: $(calculate_directory_size "$PKG_BUILD_DIR")
Description: APM addons package for ${BASE_NAME} Description: APM addons package for ${BASE_NAME}

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

@@ -872,7 +872,7 @@ cat > "${PKG_BUILD_DIR}/DEBIAN/control" << EOF
Package: $NEW_PKGNAME Package: $NEW_PKGNAME
Version: $NEW_VERSION Version: $NEW_VERSION
Architecture: $ORIG_ARCH Architecture: $ORIG_ARCH
Maintainer: APM Converter <apm-convert@spark-app.store> Maintainer: APM Converter <shenmo@spark-app.store>
Depends: $DEPENDS_STR Depends: $DEPENDS_STR
Installed-Size: $(calculate_directory_size "$PKG_BUILD_DIR") Installed-Size: $(calculate_directory_size "$PKG_BUILD_DIR")
Description: APM converted package from ${ORIG_PKGNAME:-original} Description: APM converted package from ${ORIG_PKGNAME:-original}