diff --git a/.gitignore b/.gitignore index 521bf11..fc9d160 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.deb -src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env.tar.xz +src/opt/apps/amber-ce-bookworm/files/bookworm-env.tar.xz diff --git a/src/DEBIAN/control b/src/DEBIAN/control index a7df52d..f06029f 100755 --- a/src/DEBIAN/control +++ b/src/DEBIAN/control @@ -1,8 +1,8 @@ -Package: cn.flamescion.bookworm-compatibility-mode -Version: 12.4.10 +Package: amber-ce-bookworm +Version: 12.4.11 Section: misc Priority: optional Depends: bubblewrap,flatpak,zenity,policykit-1,gcc,systemd Maintainer: shenmo <shenmo@spark-app.store> -Architecture: amd64 +Architecture: loong64 Description: bwrap wrapper for install and running debs inside a bookworm container diff --git a/src/DEBIAN/postinst b/src/DEBIAN/postinst index b92f22d..473cbce 100755 --- a/src/DEBIAN/postinst +++ b/src/DEBIAN/postinst @@ -1,9 +1,9 @@ #!/bin/bash export PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE" -/opt/apps/$PACKAGE_NAME/files/bin/bookworm-init +/opt/apps/$PACKAGE_NAME/files/bin/ace-init -if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then +if [ "${PACKAGE_NAME}" = "amber-ce-bookworm" ];then systemctl daemon-reload -systemctl enable ace-auto-upgrade -systemctl start ace-auto-upgrade +systemctl enable ace-bookworm-auto-upgrade +systemctl start ace-bookworm-auto-upgrade fi diff --git a/src/DEBIAN/postrm b/src/DEBIAN/postrm index e649349..f06bf3d 100755 --- a/src/DEBIAN/postrm +++ b/src/DEBIAN/postrm @@ -1,9 +1,9 @@ #!/bin/bash PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE" -if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then -systemctl stop ace-auto-upgrade -systemctl disable ace-auto-upgrade +if [ "${PACKAGE_NAME}" = "amber-ce-bookworm" ];then +systemctl stop ace-bookworm-auto-upgrade +systemctl disable ace-bookworm-auto-upgrade fi diff --git a/src/DEBIAN/preinst b/src/DEBIAN/preinst new file mode 100755 index 0000000..934d27b --- /dev/null +++ b/src/DEBIAN/preinst @@ -0,0 +1,9 @@ +#!/bin/bash + +if [ "${PACKAGE_NAME}" = "amber-ce-bookworm" ];then +if [ -e /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env ];then +if [ "$(arch)" != "loongarch64" ];then +mv /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env /opt/apps/amber-ce-bookworm/files/bookworm-env +fi +fi +fi diff --git a/src/etc/X11/Xsession.d/20ACE-Bookworm b/src/etc/X11/Xsession.d/20ACE-Bookworm index 97b379c..9402dd6 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/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env/usr/share/" +ACE_path="/opt/apps/amber-ce-bookworm/files/bookworm-env/usr/share/" 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 de52baa..5349701 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/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env/usr/share/" +ACE_path="/opt/apps/amber-ce-bookworm/files/bookworm-env/usr/share/" 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/usr/share/icons/ACE logo.png b/src/opt/apps/amber-ce-bookworm/ACE logo.png similarity index 100% rename from src/usr/share/icons/ACE logo.png rename to src/opt/apps/amber-ce-bookworm/ACE logo.png diff --git a/src/usr/share/icons/ACE-transparent.png b/src/opt/apps/amber-ce-bookworm/ACE-transparent.png similarity index 100% rename from src/usr/share/icons/ACE-transparent.png rename to src/opt/apps/amber-ce-bookworm/ACE-transparent.png diff --git a/src/usr/share/icons/ACE-uninstaller-orig.png b/src/opt/apps/amber-ce-bookworm/ACE-uninstaller-orig.png similarity index 100% rename from src/usr/share/icons/ACE-uninstaller-orig.png rename to src/opt/apps/amber-ce-bookworm/ACE-uninstaller-orig.png diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper b/src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper similarity index 96% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper rename to src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper index 814dde5..bdffd97 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper +++ b/src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper @@ -8,7 +8,7 @@ fi unset ABSOLUTE_PATH IN_CONTAINER_PATH PKGNAME_GUESS DPKG_LIST_FILE ACE_ENV_PATH # 定义环境路径变量 -ACE_ENV_PATH="/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env" +ACE_ENV_PATH="/opt/apps/amber-ce-bookworm/files/bookworm-env" # 检查参数个数 if [ "$#" -ne 1 ]; then diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper-gui b/src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui similarity index 94% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper-gui rename to src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui index f76e067..ba1b593 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper-gui +++ b/src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui @@ -4,7 +4,7 @@ pkexec $0 exit fi # 定义应用列表文件路径 -ACE_dir="/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env" +ACE_dir="/opt/apps/amber-ce-bookworm/files/bookworm-env" # 读取所有.desktop文件,并构造应用列表 app_list=() @@ -44,7 +44,7 @@ selected_apps=$(zenity --list --title "应用列表" --column "是否卸载" --c if [ -n "$selected_apps" ]; then # 卸载选中的应用 (for app_desktop_path in $selected_apps; do - ace-uninstall-helper "$app_desktop_path" + ace-bookworm-uninstall-helper "$app_desktop_path" ret=$? if [ "$ret" != "0" ];then zenity --error --width 768 --text "$app_desktop_path 卸载失败,中止操作\n请手动执行\nsudo ace-uninstall-helper $app_desktop_path \n查看报错!" diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init b/src/opt/apps/amber-ce-bookworm/files/bin/ace-init similarity index 96% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init rename to src/opt/apps/amber-ce-bookworm/files/bin/ace-init index c3e6bc9..161de75 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-init +++ b/src/opt/apps/amber-ce-bookworm/files/bin/ace-init @@ -76,6 +76,9 @@ export container_user_uid="$(sudo -u $non_root_user id -ru)" bookworm-run bash /flamescion-container-tools/container-init/init.sh +rm $chrootEnvPath/etc/localtime +cp $(realpath /etc/localtime) $chrootEnvPath/etc/localtime +chmod 777 $chrootEnvPath/etc/localtime bookworm-run cp /host/etc/locale.gen /etc/locale.gen && locale-gen bookworm-run touch /finish.flag bookworm-run apt clean diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run b/src/opt/apps/amber-ce-bookworm/files/bin/bookworm-run similarity index 97% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run rename to src/opt/apps/amber-ce-bookworm/files/bin/bookworm-run index c6ed572..fa996a5 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run +++ b/src/opt/apps/amber-ce-bookworm/files/bin/bookworm-run @@ -11,9 +11,9 @@ chrootEnvPath=/opt/apps/$PKGNAME/files/bookworm-env if [ ! -e $chrootEnvPath/finish.flag ];then if [ "$(id -u)" = "0" ]; then - `dirname $chrootEnvPath`/bin/bookworm-init + `dirname $chrootEnvPath`/bin/ace-init else -pkexec `dirname $chrootEnvPath`/bin/bookworm-init +pkexec `dirname $chrootEnvPath`/bin/ace-init fi diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-bwrap b/src/opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap similarity index 97% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-bwrap rename to src/opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap index 4a86fa2..3bd9054 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-bwrap +++ b/src/opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap @@ -11,9 +11,9 @@ chrootEnvPath=/opt/apps/$PKGNAME/files/bookworm-env if [ ! -e $chrootEnvPath/finish.flag ];then if [ "$(id -u)" = "0" ]; then - `dirname $chrootEnvPath`/bin/bookworm-init + `dirname $chrootEnvPath`/bin/ace-init else -pkexec `dirname $chrootEnvPath`/bin/bookworm-init +pkexec `dirname $chrootEnvPath`/bin/ace-init fi diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/build-container.sh b/src/opt/apps/amber-ce-bookworm/files/build-container.sh similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/build-container.sh rename to src/opt/apps/amber-ce-bookworm/files/build-container.sh diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/DEBIAN/control b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/DEBIAN/control similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/DEBIAN/control rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/DEBIAN/control diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/DEBIAN/postinst b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/DEBIAN/postinst similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/DEBIAN/postinst rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/DEBIAN/postinst diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/DEBIAN/triggers b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/DEBIAN/triggers similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/DEBIAN/triggers rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/DEBIAN/triggers diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration similarity index 89% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration index efd6a4c..5189193 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration +++ b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/opt/ace-host-integration/ace-host-integration @@ -49,12 +49,12 @@ local file=$1 echo "$file is detected. Processing host system integration..." sed -i 's|^Exec=\(.*\)|Exec=bookworm-run \1|' "$file" sed -i '/^TryExec=/d' "$file" - sed -i '/^Name=/ s/$/ (ACE)/' "$file" - sed -i "/^Name\[${LANGUAGE}\]=/ s/\$/ (ACE)/" "$file" + sed -i '/^Name=/ s/$/ (Bookworm)/' "$file" + sed -i "/^Name\[${LANGUAGE}\]=/ s/\$/ (Bookworm)/" "$file" icon_line=$(grep "^Icon=" "$file") if [[ "$icon_line" == "Icon=/"* ]]; then # 如果Icon=后面接的是/,则添加前缀 - sed -i 's|^Icon=/|Icon=/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env/|' "$file" + sed -i 's|^Icon=/|Icon=/opt/apps/amber-ce-bookworm/files/bookworm-env/|' "$file" fi fi diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-upgrader/ace-upgrader b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-upgrader/ace-upgrader similarity index 92% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-upgrader/ace-upgrader rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-upgrader/ace-upgrader index c2e0c1b..cf7ff31 100755 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-upgrader/ace-upgrader +++ b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-upgrader/ace-upgrader @@ -166,10 +166,10 @@ fi user=$(who | awk '{print $1}' | head -n 1) - log.info "ACE环境中有 $update_app_number 个软件包可升级,正在自动升级" -notify-send -a cn.flamescion.bookworm-compatibility-mode "ACE兼容环境" "ACE环境中有${update_app_number}个软件包可升级,执行自动升级..." + log.info "ACE Bookworm环境中有 $update_app_number 个软件包可升级,正在自动升级" +notify-send -a amber-ce-bookworm "ACE兼容环境" "ACE环境中有${update_app_number}个软件包可升级,执行自动升级..." ${APT_COMMAND} clean ${APT_COMMAND} full-upgrade -y ${APT_COMMAND} clean -notify-send -a cn.flamescion.bookworm-compatibility-mode "ACE兼容环境" "自动升级结束" +notify-send -a amber-ce-bookworm "ACE兼容环境" "自动升级结束" diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/README.md b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/README.md similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/README.md rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/README.md diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bookworm-run b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/bookworm-run similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bookworm-run rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/bookworm-run diff --git a/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/bwrap b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/bwrap new file mode 100755 index 0000000..0d3a10d --- /dev/null +++ b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/bwrap @@ -0,0 +1,2 @@ +#!/bin/bash +host-spawn /opt/apps/amber-ce-bookworm/files/bin/bookworm-run-bwrap $@ diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/gio b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/gio similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/gio rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/gio diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/host-spawn-aarch64 b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-aarch64 similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/host-spawn-aarch64 rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-aarch64 diff --git a/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-loongarch64 b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-loongarch64 new file mode 100755 index 0000000..0bea20a Binary files /dev/null and b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-loongarch64 differ diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/host-spawn-x86_64 b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-x86_64 similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/host-spawn-x86_64 rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-x86_64 diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/pkexec b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/pkexec similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/pkexec rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/pkexec diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/sudo b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/sudo similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/sudo rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/sudo diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/xdg-open b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/xdg-open similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/xdg-open rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/xdg-open diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/container-init/init.sh similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/container-init/init.sh rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/container-init/init.sh diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/info b/src/opt/apps/amber-ce-bookworm/info similarity index 84% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/info rename to src/opt/apps/amber-ce-bookworm/info index 4b65f1c..860d2ce 100644 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/info +++ b/src/opt/apps/amber-ce-bookworm/info @@ -1,5 +1,5 @@ { -"appid": "cn.flamescion.bookworm-compatibility-mode", +"appid": "amber-ce-bookworm", "name": "cn.flamescion.bookworm-compatibility-mode", "version": "12.1.4", "arch": ["amd64"], diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bwrap b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bwrap deleted file mode 100755 index 541b126..0000000 --- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bwrap +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -host-spawn /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run-bwrap $@ diff --git a/src/usr/bin/ace-bookworm-uninstall-helper b/src/usr/bin/ace-bookworm-uninstall-helper new file mode 120000 index 0000000..c89f5ed --- /dev/null +++ b/src/usr/bin/ace-bookworm-uninstall-helper @@ -0,0 +1 @@ +../../opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper \ No newline at end of file diff --git a/src/usr/bin/ace-bookworm-uninstall-helper-gui b/src/usr/bin/ace-bookworm-uninstall-helper-gui new file mode 120000 index 0000000..ce03ce4 --- /dev/null +++ b/src/usr/bin/ace-bookworm-uninstall-helper-gui @@ -0,0 +1 @@ +../../opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui \ No newline at end of file diff --git a/src/usr/bin/ace-uninstall-helper b/src/usr/bin/ace-uninstall-helper deleted file mode 120000 index 5863a46..0000000 --- a/src/usr/bin/ace-uninstall-helper +++ /dev/null @@ -1 +0,0 @@ -../../opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper \ No newline at end of file diff --git a/src/usr/bin/ace-uninstall-helper-gui b/src/usr/bin/ace-uninstall-helper-gui deleted file mode 120000 index 96e480e..0000000 --- a/src/usr/bin/ace-uninstall-helper-gui +++ /dev/null @@ -1 +0,0 @@ -../../opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper-gui \ No newline at end of file diff --git a/src/usr/bin/bookworm-run b/src/usr/bin/bookworm-run index d6f4d6b..692c8a3 120000 --- a/src/usr/bin/bookworm-run +++ b/src/usr/bin/bookworm-run @@ -1 +1 @@ -../../opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm-run \ No newline at end of file +../../opt/apps/amber-ce-bookworm/files/bin/bookworm-run \ No newline at end of file diff --git a/src/usr/lib/systemd/system/ace-auto-upgrade.service b/src/usr/lib/systemd/system/ace-bookworm-auto-upgrade.service similarity index 100% rename from src/usr/lib/systemd/system/ace-auto-upgrade.service rename to src/usr/lib/systemd/system/ace-bookworm-auto-upgrade.service 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 85a6ecd..5075421 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/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env/usr/share/" +ACE_path="/opt/apps/amber-ce-bookworm/files/bookworm-env/usr/share/" 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/usr/share/applications/ACE-bookworm-uninstaller.desktop b/src/usr/share/applications/ACE-bookworm-uninstaller.desktop new file mode 100644 index 0000000..1635d16 --- /dev/null +++ b/src/usr/share/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 diff --git a/src/usr/share/applications/ACE-uninstaller.desktop b/src/usr/share/applications/ACE-uninstaller.desktop deleted file mode 100644 index 5c9c400..0000000 --- a/src/usr/share/applications/ACE-uninstaller.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=ACE Software Uninstaller -Name[zh_CN]=ACE软件卸载器 -Comment=用于卸载ACE容器的应用 -Type=Application -Exec=/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper-gui -Icon=ACE-uninstaller -Categories=System - -# Generated from the DesktopGenerater component of the z-Tools toolkit diff --git a/src/usr/share/applications/cn.flamescion.bookworm-compatibility-mode.desktop b/src/usr/share/applications/amber-ce-bookworm.desktop similarity index 62% rename from src/usr/share/applications/cn.flamescion.bookworm-compatibility-mode.desktop rename to src/usr/share/applications/amber-ce-bookworm.desktop index 6ee12b3..2d71503 100644 --- a/src/usr/share/applications/cn.flamescion.bookworm-compatibility-mode.desktop +++ b/src/usr/share/applications/amber-ce-bookworm.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Categories=utils Exec=bookworm-run %U -Icon=cn.flamescion.bookworm-compatibility-mode -Name=Amber CE -Name[zh_CN]=ACE兼容环境 +Icon=amber-ce-bookworm +Name=Amber CE Bookworm +Name[zh_CN]=ACE Bookworm兼容环境 Keywords=BCM,ACE,ace,mode StartupNotify=true Type=Application diff --git a/src/usr/share/icons/ACE-uninstaller.png b/src/usr/share/icons/ACE-bookworm-uninstaller.png similarity index 100% rename from src/usr/share/icons/ACE-uninstaller.png rename to src/usr/share/icons/ACE-bookworm-uninstaller.png diff --git a/src/usr/share/icons/cn.flamescion.bookworm-compatibility-mode.png b/src/usr/share/icons/amber-ce-bookworm.png similarity index 100% rename from src/usr/share/icons/cn.flamescion.bookworm-compatibility-mode.png rename to src/usr/share/icons/amber-ce-bookworm.png diff --git a/src/usr/share/polkit-1/actions/cn.flamescion.ace-uninstaller.policy b/src/usr/share/polkit-1/actions/amber-ce-bookworm.ace-uninstaller.policy similarity index 63% rename from src/usr/share/polkit-1/actions/cn.flamescion.ace-uninstaller.policy rename to src/usr/share/polkit-1/actions/amber-ce-bookworm.ace-uninstaller.policy index 964ed29..b479e1b 100644 --- a/src/usr/share/polkit-1/actions/cn.flamescion.ace-uninstaller.policy +++ b/src/usr/share/polkit-1/actions/amber-ce-bookworm.ace-uninstaller.policy @@ -2,17 +2,17 @@ <!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> <policyconfig> - <vendor>cn.flamescion.ace-uninstaller</vendor> + <vendor>amber-ce-bookworm.ace-uninstaller</vendor> <icon_name>x-package-repository</icon_name> - <action id="cn.flamescion.ace-uninstaller"> - <description>运行cn.flamescion.ace-uninstaller需要权限</description> - <message>要使用cn.flamescion.ace-uninstaller需要权限</message> + <action id="amber-ce-bookworm.ace-uninstaller"> + <description>运行amber-ce-bookworm.ace-uninstaller需要权限</description> + <message>要使用amber-ce-bookworm.ace-uninstaller需要权限</message> <defaults> <allow_any>yes</allow_any> <allow_inactive>yes</allow_inactive> <allow_active>yes</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-uninstall-helper-gui</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> </policyconfig>