From 6251dd6d72efd21938562bce4360e65bfe83c2f8 Mon Sep 17 00:00:00 2001
From: MXS-Jun <bjtuzj0328@gmail.com>
Date: Sun, 2 Feb 2025 17:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20icon=20=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E7=9B=B8=E5=85=B3=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zenity-Edition/AppImage2Deb.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Zenity-Edition/AppImage2Deb.sh b/Zenity-Edition/AppImage2Deb.sh
index 5b114e1..205bf20 100755
--- a/Zenity-Edition/AppImage2Deb.sh
+++ b/Zenity-Edition/AppImage2Deb.sh
@@ -254,9 +254,7 @@ case $? in
 esac
 
 # 将 .desktop 文件复制到 applications/ 并修改文件名
-cp "${DESKTOP_FILE}" "./${ID}/opt/apps/${ID}/entries/applications/"
-DESKTOP_FILE_NAME="$(ls "./${ID}/opt/apps/${ID}/entries/applications/")"
-mv "./${ID}/opt/apps/${ID}/entries/applications/${DESKTOP_FILE_NAME}" "./${ID}/opt/apps/${ID}/entries/applications/${ID}.desktop" 
+cp "${DESKTOP_FILE}" "./${ID}/opt/apps/${ID}/entries/applications/${ID}.desktop"
 
 case $? in
     0)
@@ -295,10 +293,13 @@ case $? in
 esac
 
 # 获取 icon 文件
-PNG_FILE_NAME="$(basename ${DESKTOP_FILE_NAME} .desktop).png"
-SVG_FILE_NAME="$(basename ${DESKTOP_FILE_NAME} .desktop).svg"
-PNG_FILE="./${ID}/opt/apps/${ID}/files/bin/${PNG_FILE_NAME}"
+ICON_FIELD=$(grep -iE '^Icon=' "${DESKTOP_FILE}" | cut -d= -f2 | tr -d ' \n\r')
+ICON_FILE="$(basename "$ICON_FIELD")"
+ICON_NAME="${ICON_FILE%.*}"
+SVG_FILE_NAME="${ICON_NAME}.svg"
+PNG_FILE_NAME="${ICON_NAME}.png"
 SVG_FILE="./${ID}/opt/apps/${ID}/files/bin/${SVG_FILE_NAME}"
+PNG_FILE="./${ID}/opt/apps/${ID}/files/bin/${PNG_FILE_NAME}"
 
 if [[ -L "${SVG_FILE}" || -e "${SVG_FILE}" ]]; then
     resolved_svg=$(readlink -f "${SVG_FILE}")