spark-store-project/amber-pm
15
0
Fork 0
mirror of https://gitee.com/amber-ce/amber-pm synced 2026-08-06 09:33:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：不能读取主机 /usr/local 的字体的问题

Browse Source 
调整：不再直接直通主机主题，而是使用XDG_DATA_DIRS指定
This commit is contained in:
shenmo7192
2026-03-28 12:34:15 +08:00
parent 7a6be8244f
commit c6d7bbaf21
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.config
+1 -1
View File
@@ -1 +1 @@
@VERSION@=1.1.9 @VERSION@=1.2.0
src/var/lib/apm/apm/files/ace-run
+8 -10
View File
@@ -61,7 +61,7 @@ fi
######################################################################################### #########################################################################################
##########合成bwrap 1. 基础函数配置段 ##########合成bwrap 1. 基础函数配置段
# 初始化 EXEC_COMMAND 为 bwrap 基础指令 # 初始化 EXEC_COMMAND 为 bwrap 基础指令
EXEC_COMMAND="bwrap" EXEC_COMMAND="bwrap --dev-bind / / bwrap"
# add_command 函数定义 # add_command 函数定义
function add_command() { function add_command() {
@@ -109,7 +109,7 @@ ENV_VARS=(
"PATH /amber-ce-tools/bin-override:\$PATH" "PATH /amber-ce-tools/bin-override:\$PATH"
"IS_ACE_ENV 1" "IS_ACE_ENV 1"
"GTK_USE_PORTAL 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"
) )
# 基础绑定目录（始终绑定） # 基础绑定目录（始终绑定）
@@ -125,9 +125,6 @@ BASE_BIND_DIRS=(
"--dev-bind /run /run" "--dev-bind /run /run"
"--dev-bind-try /run/user/\$uid/pulse /run/user/\$uid/pulse" "--dev-bind-try /run/user/\$uid/pulse /run/user/\$uid/pulse"
"--dev-bind / /host" "--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 /etc/resolv.conf /etc/resolv.conf"
"--dev-bind-try /home /home" "--dev-bind-try /home /home"
"--dev-bind-try $HOME/.apm/${APM_PKG_NAME}/.deepinwine $HOME/.deepinwine" "--dev-bind-try $HOME/.apm/${APM_PKG_NAME}/.deepinwine $HOME/.deepinwine"
@@ -150,11 +147,12 @@ NON_SANDBOX_BIND_DIRS=(
) )
# 根据 APM_USE_BWRAP 决定是否添加 CAP_SYS_ADMIN # 根据 APM_USE_BWRAP 决定是否添加 CAP_SYS_ADMIN
EXTRA_ARGS=()
# EXTRA_ARGS=( if [ "${APM_USE_BWRAP:-0}" != "1" ]; then
# "--unshare-user-try" EXTRA_ARGS=(
# ) "--cap-add CAP_SYS_ADMIN"
)
fi
EXTRA_SCRIPTS=( EXTRA_SCRIPTS=(
# cursor_theme_dir_integration # cursor_theme_dir_integration
src/var/lib/apm/apm/files/bin/ace-run
+1 -4
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
### 这个工具是用来启动apm内置ACE环境的，不是用来打开应用的
bash(){ 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\]]\\\$ \"") $@ /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,9 +113,6 @@ BIND_DIRS=(
"--dev-bind /run /run" "--dev-bind /run /run"
"--dev-bind-try /run/user/\$uid/pulse /run/user/\$uid/pulse" "--dev-bind-try /run/user/\$uid/pulse /run/user/\$uid/pulse"
"--dev-bind / /host" "--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 /etc/resolv.conf /etc/resolv.conf"
"--dev-bind-try /home /home" "--dev-bind-try /home /home"
) )