diff --git a/debian/changelog b/debian/changelog index a5d394c..f84a9a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -amber-ce-bookworm (12.4.15-1) UNRELEASED; urgency=low +amber-ce-bookworm (12.5) UNRELEASED; urgency=low * fix: Can't pass args via bwrap * fix: Auto upgrade service always pop up upgradable notifier * fix: /etc/apt/sources.list only request main repo * fix: sudo function error: Need sudo sudo to really sudo * fix: ACE Host Integration fail * adjust: remove dpkg from building depends + * 把默认目录改为 amber-ce-bookworm -- shenmo Wed, 25 Sep 2024 23:15:49 +0800 diff --git a/debian/cn.flamescion.bookworm-compatibility-mode.postinst b/debian/cn.flamescion.bookworm-compatibility-mode.postinst index c312530..83618ec 100755 --- a/debian/cn.flamescion.bookworm-compatibility-mode.postinst +++ b/debian/cn.flamescion.bookworm-compatibility-mode.postinst @@ -2,17 +2,21 @@ export PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE" if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then -if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env ];then +if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ] || [[ -f "/opt/apps/amber-ce-bookworm" ]];then -mv /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/ace-env -ln -sfv /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/ace-env /opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bookworm-env +unlink /opt/apps/amber-ce-bookworm +mv -v /opt/apps/cn.flamescion.bookworm-compatibility-mode/ /opt/apps/amber-ce-bookworm/ + +ln -sv ./amber-ce-bookworm /opt/apps/cn.flamescion.bookworm-compatibility-mode fi fi + /opt/apps/$PACKAGE_NAME/files/bin/ace-init + if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then systemctl daemon-reload systemctl enable ace-bookworm-auto-upgrade diff --git a/debian/cn.flamescion.bookworm-compatibility-mode.postrm b/debian/cn.flamescion.bookworm-compatibility-mode.postrm index 12ad200..b0510c4 100755 --- a/debian/cn.flamescion.bookworm-compatibility-mode.postrm +++ b/debian/cn.flamescion.bookworm-compatibility-mode.postrm @@ -2,6 +2,7 @@ PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE" if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then +PACKAGE_NAME=amber-ce-bookworm # 为了后面正确清理 systemctl stop ace-bookworm-auto-upgrade systemctl disable ace-bookworm-auto-upgrade fi diff --git a/debian/rules b/debian/rules index 9718859..94be536 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ dh $@ override_dh_auto_configure: - cd src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files && bash build-container.sh $(shell uname -m) + cd src/opt/apps/amber-ce-bookworm/files && bash build-container.sh $(shell uname -m) override_dh_dwz: diff --git a/src/opt/apps/amber-ce-bookworm b/src/opt/apps/amber-ce-bookworm deleted file mode 120000 index 0ca24a4..0000000 --- a/src/opt/apps/amber-ce-bookworm +++ /dev/null @@ -1 +0,0 @@ -./cn.flamescion.bookworm-compatibility-mode/ \ No newline at end of file diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/ACE logo.png b/src/opt/apps/amber-ce-bookworm/ACE logo.png similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/ACE logo.png rename to src/opt/apps/amber-ce-bookworm/ACE logo.png diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/ACE-transparent.png b/src/opt/apps/amber-ce-bookworm/ACE-transparent.png similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/ACE-transparent.png rename to src/opt/apps/amber-ce-bookworm/ACE-transparent.png diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/ACE-uninstaller-orig.png b/src/opt/apps/amber-ce-bookworm/ACE-uninstaller-orig.png similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/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/entries/applications/ACE-bookworm-uninstaller.desktop b/src/opt/apps/amber-ce-bookworm/entries/applications/ACE-bookworm-uninstaller.desktop similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/applications/ACE-bookworm-uninstaller.desktop rename to src/opt/apps/amber-ce-bookworm/entries/applications/ACE-bookworm-uninstaller.desktop diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/applications/amber-ce-bookworm.desktop b/src/opt/apps/amber-ce-bookworm/entries/applications/amber-ce-bookworm.desktop similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/applications/amber-ce-bookworm.desktop rename to src/opt/apps/amber-ce-bookworm/entries/applications/amber-ce-bookworm.desktop diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/icons/ACE-bookworm-uninstaller.png b/src/opt/apps/amber-ce-bookworm/entries/icons/ACE-bookworm-uninstaller.png similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/icons/ACE-bookworm-uninstaller.png rename to src/opt/apps/amber-ce-bookworm/entries/icons/ACE-bookworm-uninstaller.png diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/icons/amber-ce-bookworm.png b/src/opt/apps/amber-ce-bookworm/entries/icons/amber-ce-bookworm.png similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/entries/icons/amber-ce-bookworm.png rename to src/opt/apps/amber-ce-bookworm/entries/icons/amber-ce-bookworm.png diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-bookworm-uninstall-helper b/src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-bookworm-uninstall-helper rename to src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-bookworm-uninstall-helper-gui b/src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-bookworm-uninstall-helper-gui rename to src/opt/apps/amber-ce-bookworm/files/bin/ace-bookworm-uninstall-helper-gui diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-init b/src/opt/apps/amber-ce-bookworm/files/bin/ace-init similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/ace-init rename to src/opt/apps/amber-ce-bookworm/files/bin/ace-init 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 100% 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 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 100% 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 diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm.ace-gxde-fixer b/src/opt/apps/amber-ce-bookworm/files/bin/bookworm.ace-gxde-fixer similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/bin/bookworm.ace-gxde-fixer rename to src/opt/apps/amber-ce-bookworm/files/bin/bookworm.ace-gxde-fixer 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.deb b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration.deb similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/ace-host-integration.deb rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration.deb 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 100% 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 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 100% 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 diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/additional-data-dir-in-container/README.md b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/additional-data-dir-in-container/README.md similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/additional-data-dir-in-container/README.md rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/additional-data-dir-in-container/README.md diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/additional-data-dir-in-container/applications/ace-run-in-host-os.desktop 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/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bwrap b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/bwrap similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/bwrap rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/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/cn.flamescion.bookworm-compatibility-mode/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 similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/bin-override/host-spawn-loongarch64 rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/host-spawn-loongarch64 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/files/flamescion-container-tools/data-dir/README.md b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/data-dir/README.md similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/files/flamescion-container-tools/data-dir/README.md rename to src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/data-dir/README.md diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode/info b/src/opt/apps/amber-ce-bookworm/info similarity index 100% rename from src/opt/apps/cn.flamescion.bookworm-compatibility-mode/info rename to src/opt/apps/amber-ce-bookworm/info diff --git a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode new file mode 120000 index 0000000..6ecb42c --- /dev/null +++ b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode @@ -0,0 +1 @@ +./amber-ce-bookworm/ \ No newline at end of file