From bf996af2c094702ba44be5a90b6968819e98d648 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Sun, 5 Apr 2026 11:58:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(desktop):=20=E4=BF=AE=E5=A4=8D=E9=9D=9E?=
 =?UTF-8?q?=E9=BA=92=E9=BA=9F=E7=B3=BB=E7=BB=9F=E4=B8=8B=E6=A1=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=81=E7=A7=BB=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-gxde-desktop-fix | 47 ++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/usr/bin/amber-pm-gxde-desktop-fix b/src/usr/bin/amber-pm-gxde-desktop-fix
index b0a0bd9..5ae9374 100755
--- a/src/usr/bin/amber-pm-gxde-desktop-fix
+++ b/src/usr/bin/amber-pm-gxde-desktop-fix
@@ -1,16 +1,14 @@
 #!/bin/bash
 
-if [[ ! -e "/usr/share/gxde-api" ]] && ! grep -q "Kylin" /etc/os-release; then
-    exit 0 # No needed
-fi
-
 # 确定目标目录
 if grep -q "Kylin" /etc/os-release; then
     TARGET_BASE="/usr/share"
+    APP_TARGET_DIR="$TARGET_BASE/applications"
     echo "检测到麒麟系统，使用目标目录: $TARGET_BASE"
 else
     TARGET_BASE="/usr/local/share"
-    echo "检测到GXDE环境，使用目标目录: $TARGET_BASE"
+    APP_TARGET_DIR="$TARGET_BASE/applications/apm"
+    echo "检测到非麒麟系统，使用目标目录: $APP_TARGET_DIR"
 fi
 
 function ensure_dir() {
@@ -52,16 +50,49 @@ process_directory() {
 }
 
 # 使用动态确定的目标目录
-ensure_dir "$TARGET_BASE/applications/"
+ensure_dir "$APP_TARGET_DIR/"
 ensure_dir "$TARGET_BASE/icons/"
 
 # 处理 applications 目录
 process_directory "/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/applications/" \
-                  "$TARGET_BASE/applications/" "Applications"
+                  "$APP_TARGET_DIR/" "Applications"
 
 # 处理 icons 目录
 process_directory "/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/icons/" \
                   "$TARGET_BASE/icons/" "Icons"
 
 # 等待所有后台任务完成
-wait
\ No newline at end of file
+wait
+
+# 迁移老链接（仅非麒麟系统需要）
+if ! grep -q "Kylin" /etc/os-release; then
+    OLD_LINK_DIR="/usr/local/share/applications"
+    # 检查旧目录是否存在且不是apm子目录
+    if [ -d "$OLD_LINK_DIR" ] && [ "$OLD_LINK_DIR" != "$APP_TARGET_DIR" ]; then
+        echo "检查并迁移老链接..."
+        # 查找旧目录中指向APM数据目录的符号链接
+        find "$OLD_LINK_DIR" -maxdepth 1 -type l | while read -r link; do
+            target=$(readlink "$link")
+            # 如果链接指向APM的数据目录
+            if [[ "$target" == /var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/applications/* ]]; then
+                filename=$(basename "$link")
+                # 如果新位置没有同名文件，则移动
+                if [ ! -e "$APP_TARGET_DIR/$filename" ]; then
+                    echo "迁移老链接: $filename"
+                    mv -v "$link" "$APP_TARGET_DIR/"
+                else
+                    echo "新位置已存在 $filename，删除老链接"
+                    rm -v "$link"
+                fi
+            fi
+        done
+    fi
+fi
+
+# 更新桌面数据库
+if command -v update-desktop-database >/dev/null 2>&1; then
+    echo "正在更新桌面数据库..."
+    update-desktop-database "$TARGET_BASE/applications/"
+else
+    echo "警告: update-desktop-database 命令未找到"
+fi
\ No newline at end of file