修复：无法正确展开环境

Signed-off-by: shenmo <jifengshenmo@outlook.com>
12.6.2
2025-12-14 19:12:05 +08:00 · 2025-02-25 03:10:40 +00:00 · 2025-02-24 19:08:38 +08:00 · 2025-02-24 19:06:58 +08:00 · 2025-02-16 17:48:37 +00:00
6 changed files with 10 additions and 7 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-amber-ce-bookworm (12.6.1) UNRELEASED; urgency=low
+amber-ce-bookworm (12.6.2) 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
@@ -7,5 +7,6 @@ amber-ce-bookworm (12.6.1) UNRELEASED; urgency=low
  * adjust: remove dpkg from building depends
  * 把默认目录改为 amber-ce-bookworm
  * 支持使用Nvidia驱动加速
+  * 修复 Root 下无法获取IS_ACE_ENV=1

 -- shenmo <shenmo@spark-app.store>  Wed, 25 Sep 2024 23:15:49 +0800
--- a/debian/cn.flamescion.bookworm-compatibility-mode.postinst
+++ b/debian/cn.flamescion.bookworm-compatibility-mode.postinst
@@ -2,18 +2,20 @@
 export PACKAGE_NAME="$DPKG_MAINTSCRIPT_PACKAGE"

 if [ "${PACKAGE_NAME}" = "cn.flamescion.bookworm-compatibility-mode" ];then
-if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ] || [[ -f "/opt/apps/amber-ce-bookworm" ]];then
+PACKAGE_NAME=amber-ce-bookworm # 为了后面正确清理
+if [ -d /opt/apps/cn.flamescion.bookworm-compatibility-mode/ ];then

 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


--- a/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/etc/environment.d/90is_ace_env.conf
+++ b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/ace-host-integration/etc/environment.d/90is_ace_env.conf
@@ -0,0 +1 @@
+IS_ACE_ENV=1
--- a/src/opt/apps/amber-ce-bookworm/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
@@ -63,7 +63,7 @@ local file=$1
    chmod +x $file
 }

-if [  "${IS_ACE_ENV}" != "" ] || [[ -e /opt/ace-host-integration/ace-host-integration ]] && [[ -e /flamescion-container-tools ]];then
+if [  "${IS_ACE_ENV}" != "" ] ;then
 	if [ -e /opt/apps/ ];then
 	for app_dir in $(ls /opt/apps/); do
 		for file in /opt/apps/$app_dir/entries/applications/*.desktop;do
--- a/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/sudo
+++ b/src/opt/apps/amber-ce-bookworm/files/flamescion-container-tools/bin-override/sudo
@@ -2,5 +2,5 @@
 if [ "$UID" = "0" ];then
 /usr/bin/sudo $@
 else
-host-spawn sudo bookworm-run sudo $@
+host-spawn sudo bookworm-run sudo env IS_ACE_ENV="1" "$@"
 fi
--- a/src/opt/apps/cn.flamescion.bookworm-compatibility-mode
+++ b/src/opt/apps/cn.flamescion.bookworm-compatibility-mode
@@ -1 +0,0 @@
-./amber-ce-bookworm/
Author	SHA1	Message	Date
shenmo	0f8fb5df67	修复：无法正确展开环境 Signed-off-by: shenmo <jifengshenmo@outlook.com>	2025-02-25 03:10:40 +00:00
shenmo	ae87013a3a	12.6.2	2025-02-24 19:08:38 +08:00
shenmo	885eb4cfc6	update:在root下也有 IS_ACE_ENV=1 了	2025-02-24 19:06:58 +08:00
shenmo	72d926d928	删除文件 src/opt/apps/cn.flamescion.bookworm-compatibility-mode	2025-02-16 17:48:37 +00:00