From e088cca3832e4f6d3327510a20055617848e4b2e Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 24 Oct 2025 11:58:53 +0800
Subject: [PATCH] use data dir to avoid errors in DATA_DIRS

---
 src/etc/X11/Xsession.d/20apm                           | 2 +-
 src/etc/profile.d/apm.sh                               | 2 +-
 src/usr/lib/systemd/user-environment-generators/60-apm | 2 +-
 src/var/lib/apm/apm/files/bin/ace-init                 | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/etc/X11/Xsession.d/20apm b/src/etc/X11/Xsession.d/20apm
index fadc22c..f681921 100755
--- a/src/etc/X11/Xsession.d/20apm
+++ b/src/etc/X11/Xsession.d/20apm
@@ -10,7 +10,7 @@ fi
 
 # Desktop files (used by desktop environments within both X11 and Wayland) are
 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for ACE
-ACE_path="/var/lib/apm/apm/files/ace-env/usr/share/"
+ACE_path="/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/"
 if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then
     export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${ACE_path}"
 fi
diff --git a/src/etc/profile.d/apm.sh b/src/etc/profile.d/apm.sh
index 003bcc1..8accecf 100755
--- a/src/etc/profile.d/apm.sh
+++ b/src/etc/profile.d/apm.sh
@@ -9,7 +9,7 @@ fi
 
 # Desktop files (used by desktop environments within both X11 and Wayland) are
 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for ACE
-ACE_path="/var/lib/apm/apm/files/ace-env/usr/share/"
+ACE_path="/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/"
 if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then
     export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${ACE_path}"
 fi
diff --git a/src/usr/lib/systemd/user-environment-generators/60-apm b/src/usr/lib/systemd/user-environment-generators/60-apm
index 666e1d7..c2834cb 100755
--- a/src/usr/lib/systemd/user-environment-generators/60-apm
+++ b/src/usr/lib/systemd/user-environment-generators/60-apm
@@ -10,7 +10,7 @@ fi
 
 # Desktop files (used by desktop environments within both X11 and Wayland) are
 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for ACE
-ACE_path="/var/lib/apm/apm/files/ace-env/usr/share/"
+ACE_path="/var/lib/apm/apm/files/ace-env/amber-ce-tools/data-dir/"
 if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then
     export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${ACE_path}"
 fi
diff --git a/src/var/lib/apm/apm/files/bin/ace-init b/src/var/lib/apm/apm/files/bin/ace-init
index bb07c71..ad7af16 100755
--- a/src/var/lib/apm/apm/files/bin/ace-init
+++ b/src/var/lib/apm/apm/files/bin/ace-init
@@ -111,6 +111,9 @@ sudo -u $(get_current_user) bwrap --dev-bind $chrootEnvPath/ / \
   locale-gen
 bookworm-run update-locale LANG=$LANG
 chown -R root $chrootEnvPath
+mkdir -p $chrootEnvPath/amber-ce-tools/data-dir
+ln -sv ../../usr/share/applications $chrootEnvPath/amber-ce-tools/data-dir/applications/
+ln -sv ../../usr/share/icons $chrootEnvPath/amber-ce-tools/data-dir/icons/
 chmod 777 -R $chrootEnvPath/usr/share/icons
 rm -vfr $chrootEnvPath/dev/*
 true
\ No newline at end of file