From 7b06cf293bc4b6beaf4b80131b8e32677d5e50b9 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 31 Oct 2025 13:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=8C=85=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=9C=80=E8=A6=81=E5=AE=89=E8=A3=85dpkg;?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20apm=20debug=20=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/usr/bin/amber-pm-convert          |   8 ++++++--
 src/usr/bin/amber-pm-upgrade-notifier |   0
 src/usr/bin/apm                       |   1 +
 src/usr/share/icons/apm.png           | Bin
 4 files changed, 7 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 src/usr/bin/amber-pm-upgrade-notifier
 mode change 100644 => 100755 src/usr/share/icons/apm.png

diff --git a/src/usr/bin/amber-pm-convert b/src/usr/bin/amber-pm-convert
index f77752f..3a98525 100755
--- a/src/usr/bin/amber-pm-convert
+++ b/src/usr/bin/amber-pm-convert
@@ -7,6 +7,10 @@ log.info() { echo -e "[\e[96mINFO\e[0m]:  \e[1m$*\e[0m"; }
 log.debug()  { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; }
 SCRIPT_NAME=$(basename "$0")
 
+if ! command -v dpkg > /dev/null ;then
+log.error "若想使用APM软件包转换器，您需先安装dpkg"
+exit 1
+fi
 # 显示用法信息
 usage() {
     echo "用法: $SCRIPT_NAME --base <basename> [--base <basename> ...] <deb文件路径> [--pkgname <包名>] [--version <版本号>]"
@@ -274,7 +278,7 @@ mkdir -p "$MODIFIED_DEB_DIR/data"
 cp -r "$EXTRACT_DIR"/* "$MODIFIED_DEB_DIR/" 2>/dev/null || true
 
 # 使用fakeroot重新打包
-cd "$MODIFIED_DEB_DIR" && fakeroot amber-pm-debug dpkg-deb --build -Z none . "$MODIFIED_DEB_PATH"
+cd "$MODIFIED_DEB_DIR" && fakeroot  dpkg-deb --build -Z none . "$MODIFIED_DEB_PATH"
 cd - > /dev/null
 
 if [ ! -f "$MODIFIED_DEB_PATH" ]; then
@@ -387,7 +391,7 @@ EOF
 OUTPUT_DEB="${NEW_PKGNAME}_${NEW_VERSION}_${ORIG_ARCH}.deb"
 
 # 打包
-fakeroot amber-pm-debug dpkg-deb --build "$PKG_BUILD_DIR" "$OUTPUT_DEB"
+fakeroot  dpkg-deb --build "$PKG_BUILD_DIR" "$OUTPUT_DEB"
 
 log.info  "转换完成！"
 log.info "生成的APM包: $OUTPUT_DEB"
diff --git a/src/usr/bin/amber-pm-upgrade-notifier b/src/usr/bin/amber-pm-upgrade-notifier
old mode 100644
new mode 100755
diff --git a/src/usr/bin/apm b/src/usr/bin/apm
index 14b93af..8bee2d9 100755
--- a/src/usr/bin/apm
+++ b/src/usr/bin/apm
@@ -315,6 +315,7 @@ case "$1" in
         fi
         ;;
     debug)
+        shift
         debug_info $@
         ;;
     ssaudit)
diff --git a/src/usr/share/icons/apm.png b/src/usr/share/icons/apm.png
old mode 100644
new mode 100755