Merge remote-tracking branch 'refs/remotes/origin/master'

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

build.config

@@ -1 +1 @@
-@VERSION@=1.1.9
+@VERSION@=1.2.0

src/DEBIAN/postinst

@@ -15,7 +15,7 @@ systemctl restart apparmor.service || true
         fi
 		# Send statistics data
 		/var/lib/apm/apm/files/feedback.sh &
-        ln -sv  ../ /host
+        ln -sv / /host
 		amber-pm-dstore-patch
 
 ;;

src/usr/bin/amber-pm-convert

@@ -655,7 +655,7 @@ log.info "搜索并清理 .dpkg-new 文件..."
 log.info "删除 .dpkg-new 文件.."
 find "$CRAFT_DIR/core" -name "*.dpkg-new"  2>/dev/null | while read -r file; do
 
-    sudo rm -vf "$file" 
+    sudo rm -vfr "$file" 
 done
 
 # 统计清理结果

src/var/lib/apm/apm/files/ace-run

@@ -61,7 +61,7 @@ fi
 #########################################################################################
 ##########合成bwrap 1. 基础函数配置段
 # 初始化 EXEC_COMMAND 为 bwrap 基础指令
-EXEC_COMMAND="bwrap"
+EXEC_COMMAND="bwrap --dev-bind / / bwrap"
 
 # add_command 函数定义
 function add_command() {
@@ -109,7 +109,8 @@ ENV_VARS=(
     "PATH /amber-ce-tools/bin-override:\$PATH"
     "IS_ACE_ENV 1"
     "GTK_USE_PORTAL 1"
-    "XDG_DATA_DIRS /amber-ce-tools/additional-data-dir-in-container:\$XDG_DATA_DIRS"
+    "XDG_DATA_DIRS /amber-ce-tools/additional-data-dir-in-container:/host/usr/local/share:/host/usr/share:\$XDG_DATA_DIRS"
+    "XCURSOR_PATH /host/usr/share/icons:/host/usr/share/cursors:/usr/share/icons:/usr/share/cursors:\$XCURSOR_PATH"
 )
 
 # 基础绑定目录（始终绑定）
@@ -125,9 +126,6 @@ BASE_BIND_DIRS=(
     "--dev-bind /run /run"
     "--dev-bind-try /run/user/\$uid/pulse /run/user/\$uid/pulse"
     "--dev-bind / /host"
-    "--ro-bind-try /usr/share/themes /usr/local/share/themes"
-    "--ro-bind-try /usr/share/icons /usr/share/icons"
-    "--ro-bind-try /usr/share/fonts /usr/local/share/fonts"
     "--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
     "--dev-bind-try /home /home"
     "--dev-bind-try $HOME/.apm/${APM_PKG_NAME}/.deepinwine $HOME/.deepinwine"
@@ -150,11 +148,13 @@ NON_SANDBOX_BIND_DIRS=(
 )
 
 # 根据 APM_USE_BWRAP 决定是否添加 CAP_SYS_ADMIN
-
+# 为修复Steam问题，强制都不加
+EXTRA_ARGS=()
+#if [ "${APM_USE_BWRAP:-0}" != "1" ]; then
 #    EXTRA_ARGS=(
-#        "--unshare-user-try"
+#        "--cap-add CAP_SYS_ADMIN"
 #    )
-
+#fi
 
 EXTRA_SCRIPTS=(
 #    cursor_theme_dir_integration

src/var/lib/apm/apm/files/ace-run-pkg

@@ -104,9 +104,9 @@ BIND_DIRS=(
     "--dev-bind-try /home /home"
 )
 EXTRA_ARGS=(
-    "--hostname Amber-PM"
+#    "--hostname Amber-PM"
-    "--unshare-uts"
+#    "--unshare-uts"
-    "--cap-add CAP_SYS_ADMIN"
+#    "--cap-add CAP_SYS_ADMIN"
 )
 
 EXTRA_SCRIPTS=(

src/var/lib/apm/apm/files/bin/ace-run

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+### 这个工具是用来启动apm内置ACE环境的，不是用来打开应用的
 bash(){
 /usr/bin/bash --rcfile <(cat ~/.bashrc; echo "PS1=\"\[\e[37;40m\][\[\e[32;40m\]\u\[\e[37;40m\]@Amber-PM \[\e[36;40m\]\w\[\e[0m\]]\\\$ \"") $@
 }
@@ -113,14 +113,11 @@ BIND_DIRS=(
     "--dev-bind /run /run"
     "--dev-bind-try /run/user/\$uid/pulse /run/user/\$uid/pulse"
     "--dev-bind / /host"
-    "--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"
     "--dev-bind-try /etc/resolv.conf /etc/resolv.conf"
     "--dev-bind-try /home /home"
 )
 EXTRA_ARGS=(
-    "--cap-add CAP_SYS_ADMIN"
+#    "--cap-add CAP_SYS_ADMIN"
 )
 
 EXTRA_SCRIPTS=(