diff options
| author | lilongyu | 2024-03-09 13:08:19 +0800 |
|---|---|---|
| committer | lilongyu | 2024-03-09 13:08:19 +0800 |
| commit | 44ff7c7e14273972c108dfab6c4e283d4165b33a (patch) | |
| tree | aa778b55b6f1dd7c65abf58df2c372e52b6bfbca | |
| parent | 5fe683d94fb255a50f70b68a1e0fb2f78633fecd (diff) | |
| download | aur-44ff7c7e14273972c108dfab6c4e283d4165b33a.tar.gz | |
do not directly overriding environment vairiables
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | wechat.sh | 22 |
3 files changed, 21 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = wechat-beta-bwrap pkgdesc = WeChat Testing with bwrap sandbox pkgver = 1.0.0.145 - pkgrel = 10 + pkgrel = 11 arch = x86_64 license = proprietary depends = nss @@ -20,7 +20,7 @@ pkgbase = wechat-beta-bwrap source = license.tar.gz source = wechat-uos_2.1.5_amd64.deb::https://home-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_amd64.deb source = wechat-beta_1.0.0.145_amd64.deb::https://cdn4.cnxclm.com/uploads/2024/03/05/3VDyAc0x_wechat-beta_1.0.0.145_amd64.deb?attname=wechat-beta_1.0.0.145_amd64.deb - md5sums = 44061f8f6beeb0507fe664fdca69e72d + md5sums = 5bbe5144ec0623faf514b7a191163fac md5sums = 4967385a00db424e596263618335411f md5sums = cf971cb2cb01d8a5fd89d3a3555abfaf md5sums = 6b159c6e9d21a98925489bc37a9aea43 @@ -2,7 +2,7 @@ # pkgname=wechat-beta-bwrap pkgver=1.0.0.145 -pkgrel=10 +pkgrel=11 uosver=2.1.5 epoch= pkgdesc="WeChat Testing with bwrap sandbox" @@ -25,7 +25,7 @@ noextract=( wechat-beta_${pkgver}_amd64.deb ) -md5sums=('44061f8f6beeb0507fe664fdca69e72d' +md5sums=('5bbe5144ec0623faf514b7a191163fac' '4967385a00db424e596263618335411f' 'cf971cb2cb01d8a5fd89d3a3555abfaf' '6b159c6e9d21a98925489bc37a9aea43' diff --git a/wechat.sh b/wechat.sh index 92c91959504a..899a6e3320e7 100644 --- a/wechat.sh +++ b/wechat.sh @@ -1,8 +1,24 @@ #!/bin/bash +# wechat-beta only support xcb +BWRAP_ENV_APPEND="--setenv QT_QPA_PLATFORM xcb " + +if [ -z ${QT_IM_MODULE} ]; then + BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_IM_MODULE fcitx" +fi + +if [ -z ${QT_SCALE_FACTOR} ]; then + BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_SCALE_FACTOR 1.5" +fi + +if [ -z ${GTK_USE_PORTAL} ]; then + BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv GTK_USE_PORTAL 1" +fi + if [ ! -d "${HOME}/Documents/WeChat_Data" ]; then mkdir -p ${HOME}/Documents/WeChat_Data fi + exec bwrap \ --dev-bind / / \ --bind ${HOME}/Documents/WeChat_Data ${HOME} \ @@ -10,9 +26,5 @@ exec bwrap \ --ro-bind /usr/share/wechat-uos/etc/os-release /etc/os-release \ --ro-bind /usr/share/wechat-uos/etc/lsb-release /etc/lsb-release \ --ro-bind-try /usr/lib/snapd-xdg-open/xdg-open /usr/bin/xdg-open \ - --setenv QT_QPA_PLATFORM xcb \ - --setenv QT_IM_MODULE fcitx \ - --setenv QT_SCALE_FACTOR 1.5 \ - --setenv GTK_USE_PORTAL 1 \ + ${BWRAP_ENV_APPEND} \ /opt/wechat-beta/wechat $@ - |