spark-store-project/amber-ce-bookworm
15
0
Fork 0
mirror of https://gitee.com/amber-ce/amber-ce-bookworm.git synced 2025-10-06 01:42:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

尝试修复和桌面冲突

Browse Source
This commit is contained in:
shenmo 2024-03-23 17:50:39 +08:00
parent fd1d9dded0
commit 6d76dc98aa
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/X11/Xsession.d/20ACE-Bookworm
View File

@ -10,7 +10,7 @@ fi
# Desktop files (used by desktop environments within both X11 and Wayland) are # 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 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for ACE
ACE_path="/opt/apps/amber-ce-bookworm/files/ace-env/usr/share/" ACE_path="/opt/apps/amber-ce-bookworm/files/ace-env/flamescion-container-tools/data-dir/"
if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then
export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}" export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}"
fi fi

2
src/etc/profile.d/ACE-Bookworm.sh
View File

@ -9,7 +9,7 @@ fi
# Desktop files (used by desktop environments within both X11 and Wayland) are # 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 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for ACE
ACE_path="/opt/apps/amber-ce-bookworm/files/ace-env/usr/share/" ACE_path="/opt/apps/amber-ce-bookworm/files/ace-env/flamescion-container-tools/data-dir/"
if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then
export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}" export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}"
fi fi

11
src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh
View File

@ -121,9 +121,8 @@ ln -sfv /flamescion-container-tools/bin-override/host-spawn-$(uname -m) /flamesc
apt install --reinstall /flamescion-container-tools/ace-host-integration.deb apt install --reinstall /flamescion-container-tools/ace-host-integration.deb
cd /
mkdir -p /flamescion-container-tools/data-dir
echo "ACE: Timezone Integration" cd /flamescion-container-tools/data-dir/
rm /etc/localtime ln -sfv ../../usr/share/applications/ .
cp $(realpath /host/etc/localtime) /etc/localtime ln -sfv ../../usr/share/icons/ .
chmod 777 /etc/localtime

2
src/usr/lib/systemd/user-environment-generators/60-ACE-Bookworm
View File

@ -10,7 +10,7 @@ fi
# Desktop files (used by desktop environments within both X11 and Wayland) are # 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 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for ACE
ACE_path="/opt/apps/amber-ce-bookworm/files/ace-env/usr/share/" ACE_path="/opt/apps/amber-ce-bookworm/files/ace-env/flamescion-container-tools/data-dir/"
if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then if [ -n "${XDG_DATA_DIRS##*${ACE_path}}" ] && [ -n "${XDG_DATA_DIRS##*${ACE_path}:*}" ]; then
export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}" export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}"
fi fi