add data

Signed-off-by: shenmo <jifengshenmo@outlook.com>

README.md

@@ -21,7 +21,7 @@ Please use `git clone --recurse-submodules` to obtain the env
 
 ### Quick Install (Need to install Spark Store first)
 
-[spk://store/tools/cn.flamescion.bookworm-compatibility-mode/](https://spark-store-project.gitee.io/spk-resolv/?spk=spk://store/tools/cn.flamescion.bookworm-compatibility-mode/)
+[spk://store/tools/cn.flamescion.bookworm-compatibility-mode/](https://spk-resolv.spark-app.store/?spk=spk://store/tools/cn.flamescion.bookworm-compatibility-mode/)
 
 ### Manual Install（Debian/Fedora/Arch)
 

README.zh.md

@@ -15,7 +15,7 @@
 
 ### 快捷安装 (需要安装星火应用商店)
 
-[spk://store/tools/cn.flamescion.bookworm-compatibility-mode/](https://spark-store-project.gitee.io/spk-resolv/?spk=spk://store/tools/cn.flamescion.bookworm-compatibility-mode/)
+[spk://store/tools/cn.flamescion.bookworm-compatibility-mode/](https://spk-resolv.spark-app.store/?spk=spk://store/tools/cn.flamescion.bookworm-compatibility-mode/)
 
 ### 手动安装（Debian/Fedora/Arch)
 

src/DEBIAN/control

@@ -1,8 +1,8 @@
 Package: cn.flamescion.bookworm-compatibility-mode
-Version: 12.4.11
+Version: 12.4.13.1
 Section: misc
 Priority: optional
-Depends: bubblewrap,flatpak,zenity,policykit-1,gcc,systemd
+Depends: bubblewrap,flatpak,zenity,policykit-1,systemd,procps
 Maintainer: shenmo <shenmo@spark-app.store>
-Architecture: arm64
+Architecture: amd64
 Description: bwrap wrapper for install and running debs inside a bookworm container

src/DEBIAN/postinst

@@ -19,5 +19,6 @@ systemctl enable ace-bookworm-auto-upgrade
 systemctl start ace-bookworm-auto-upgrade
 fi
 
+systemctl reload apparmor
 
-true
+true

src/etc/X11/Xsession.d/20ACE-Bookworm

@@ -12,6 +12,6 @@ fi
 # 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/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}"
+    export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${ACE_path}"
 fi
 

src/etc/apparmor.d/amber-ce-bookworm

@@ -0,0 +1,7 @@
+abi <abi/4.0>,
+include <tunables/global>
+profile bwrap /usr/bin/bwrap flags=(unconfined) {
+userns,
+#Site-specific additions and overrides. See local/README for details.
+include if exists <local/bwrap>
+}

src/etc/profile.d/ACE-Bookworm.sh

@@ -11,6 +11,6 @@ fi
 # 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/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}"
+    export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${ACE_path}"
 fi
 

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/applications/ACE-bookworm-uninstaller.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=ACE Bookworm Software Uninstaller
+Name[zh_CN]=ACE Bookworm软件卸载器
+Comment=用于卸载ACE容器的应用
+Type=Application
+Exec=/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui
+Icon=ACE-bookworm-uninstaller
+Categories=System
+
+# Generated from the DesktopGenerater component of the z-Tools toolkit

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/applications/amber-ce-bookworm.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=utils
+Exec=bookworm-run %U
+Icon=amber-ce-bookworm
+Name=Amber CE Bookworm
+Name[zh_CN]=ACE Bookworm兼容环境
+Keywords=BCM,ACE,ace,mode
+StartupNotify=true
+Type=Application
+Terminal=true
+Categories=System

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-init

@@ -61,8 +61,6 @@ bwrap --dev-bind $chrootEnvPath/ / \
 echo "Update the flamescion container tools"
 cp -r `dirname $chrootEnvPath`/flamescion-container-tools/  $chrootEnvPath
 
-rm -rf $chrootEnvPath/usr/lib/`gcc -dumpmachine`/dri/dri
-# 之前错误的多复制了一个，这里删掉
 
 export container_user_gid="$(sudo -u $non_root_user id -rg)"
 export container_user_home="/home/${non_root_user}"

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run

@@ -106,6 +106,7 @@ BIND_DIRS=(
     "--dev-bind-try /media /media"
     "--dev-bind-try /mnt /mnt"
     "--dev-bind-try /tmp /tmp"
+    "--dev-bind-try /data /data"
     "--dev /dev"
     "--dev-bind-try /dev/dri /dev/dri"
     "--proc /proc"
@@ -116,10 +117,8 @@ BIND_DIRS=(
     "--ro-bind-try /usr/share/themes /usr/local/share/themes"
     "--ro-bind-try /usr/share/icons /usr/local/share/icons"
     "--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
-    "--ro-bind-try $(realpath /etc/localtime) /etc/localtime"
     "--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
     "--dev-bind-try /home /home"
-
 )
 EXTRA_ARGS=(
     "--hostname Amber-CE-Bookworm"

src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-bwrap

@@ -105,6 +105,7 @@ BIND_DIRS=(
     "--dev-bind $chrootEnvPath/ /"
     "--dev-bind-try /media /media"
     "--dev-bind-try /tmp /tmp"
+    "--dev-bind-try /data /data"
     "--dev /dev"
     "--dev-bind-try /dev/dri /dev/dri"
     "--proc /proc"

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

@@ -127,5 +127,6 @@ apt install --reinstall /flamescion-container-tools/ace-host-integration.deb
 cd /flamescion-container-tools/data-dir/
 ln -sfv ../../usr/share/applications/ .
 ln -sfv ../../usr/share/icons/ .
+ln -svf ../../usr/share/mime .
 update-desktop-database /usr/share/applications || true
 update-mime-database /usr/share/mime || true

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

@@ -12,6 +12,6 @@ fi
 # 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/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}"
+    export XDG_DATA_DIRS="${XDG_DATA_DIRS}:${ACE_path}"
 fi