summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorplokid2023-02-11 11:24:22 +0800
committerplokid2023-02-11 11:24:22 +0800
commite8880e619ca02ca3dce267a1f9b78098364f378e (patch)
tree8478b0259de4245eede21ecf41ca2b1c86d3165e
parentbdfe369eb359793c02b38d617f5287e6cfe4e41e (diff)
downloadaur-e8880e619ca02ca3dce267a1f9b78098364f378e.tar.gz
fix folder bugs
-rw-r--r--PKGBUILD4
-rwxr-xr-xwps-bwrap7
2 files changed, 7 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 36bfcf9e9d08..00960793248a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=wps-office-bwrap
pkgver=1.0
-pkgrel=1
+pkgrel=2
pkgdesc="use bubblewrap sandbox to stop wpscloudsvr"
arch=('any')
url="https://blog.ruo-chen.wang/2021/08/bwrap-wps.html"
@@ -12,7 +12,7 @@ depends=('wps-office' 'bubblewrap')
source=("wps-office-bwrap.desktop"
"wps-bwrap")
sha256sums=('9bb5195bcbcf72621e5a1a7aeeb8a3c989378c54ad59617f6d068477114596d3'
- '6f449ba7f78365f81d6d8dd1f4624deb4c799e965773e75cd805ed37a31f6166')
+ '370e2eaaaeb1abf3ffa103bf3b607f6d125cba1a749e2208b3a4584acdcf00c1')
package() {
install -Dm664 $srcdir/wps-office-bwrap.desktop $pkgdir/usr/share/applications/wps-office-bwrap.desktop
diff --git a/wps-bwrap b/wps-bwrap
index acd1c6da3f90..cc5671f8d905 100755
--- a/wps-bwrap
+++ b/wps-bwrap
@@ -11,10 +11,14 @@ case $file in
esac
binds=()
-for dir in fontconfig gtk-2.0 gtk-3.0 mimeapps.list Kingsoft; do
+for dir in fontconfig gtk-2.0 gtk-3.0 gtk-4.0 kingsoft Kingsoft; do
+ if [ ! -d ~/.config/"$dir" ]; then mkdir ~/.config/"$dir"; fi
binds+=(--bind ~/.config/"$dir" ~/.config/"$dir")
done
+binds+=(--bind ~/.config/mimeapps.list ~/.config/mimeapps.list)
binds+=(--bind ~/.local/share/Kingsoft ~/.local/share/Kingsoft)
+DOC_DIR=$(xdg-user-dir DOCUMENTS)
+binds+=(--bind $DOC_DIR $DOC_DIR)
# bind mount 需要操作的文件
if [[ -f "$file" ]]; then
@@ -28,5 +32,4 @@ exec bwrap --unshare-all --share-net --die-with-parent \
--ro-bind "$XDG_RUNTIME_DIR" "$XDG_RUNTIME_DIR" \
--ro-bind /tmp/.X11-unix /tmp/.X11-unix \
"${binds[@]}" \
- --bind ~/Documents ~/Documents \
"$exe" "$@"