diff --git a/src/etc/X11/Xsession.d/20ACE-Bookworm b/src/etc/X11/Xsession.d/20ACE-Bookworm index c2cb0a9..e34fad8 100755 --- a/src/etc/X11/Xsession.d/20ACE-Bookworm +++ b/src/etc/X11/Xsession.d/20ACE-Bookworm @@ -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="/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 export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}" fi diff --git a/src/etc/profile.d/ACE-Bookworm.sh b/src/etc/profile.d/ACE-Bookworm.sh index 844e792..bf76834 100755 --- a/src/etc/profile.d/ACE-Bookworm.sh +++ b/src/etc/profile.d/ACE-Bookworm.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="/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 export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}" fi diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh index 706d9f1..fd771b6 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh +++ b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh @@ -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 - - -echo "ACE: Timezone Integration" -rm /etc/localtime -cp $(realpath /host/etc/localtime) /etc/localtime -chmod 777 /etc/localtime +cd / +mkdir -p /flamescion-container-tools/data-dir +cd /flamescion-container-tools/data-dir/ +ln -sfv ../../usr/share/applications/ . +ln -sfv ../../usr/share/icons/ . diff --git a/src/usr/lib/systemd/user-environment-generators/60-ACE-Bookworm b/src/usr/lib/systemd/user-environment-generators/60-ACE-Bookworm index 3af584c..b44dd4a 100755 --- a/src/usr/lib/systemd/user-environment-generators/60-ACE-Bookworm +++ b/src/usr/lib/systemd/user-environment-generators/60-ACE-Bookworm @@ -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="/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 export XDG_DATA_DIRS="${ACE_path}:${XDG_DATA_DIRS}" fi