diff options
| author | lilongyu | 2024-03-11 00:30:01 +0800 |
|---|---|---|
| committer | lilongyu | 2024-03-11 00:31:41 +0800 |
| commit | fc2fad46859a138f2aae0045698e251153a6cdd3 (patch) | |
| tree | ef11044067e91b68eb562f2e58519afd8f85614a | |
| parent | 44ff7c7e14273972c108dfab6c4e283d4165b33a (diff) | |
| download | aur-fc2fad46859a138f2aae0045698e251153a6cdd3.tar.gz | |
add wechat-uos conflicts
use xdg-user-dir to guess xdg-documents directory
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | wechat.sh | 9 |
3 files changed, 14 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = wechat-beta-bwrap pkgdesc = WeChat Testing with bwrap sandbox pkgver = 1.0.0.145 - pkgrel = 11 + pkgrel = 12 arch = x86_64 license = proprietary depends = nss @@ -9,9 +9,11 @@ pkgbase = wechat-beta-bwrap depends = libxss depends = libnotify depends = bubblewrap + depends = xdg-user-dirs depends = xdg-desktop-portal depends = openssl-1.1 depends = lsb-release + conflicts = wechat-uos noextract = wechat-uos_2.1.5_amd64.deb noextract = wechat-beta_1.0.0.145_amd64.deb source = wechat.sh @@ -20,7 +22,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 = 5bbe5144ec0623faf514b7a191163fac + md5sums = 222a2eb9b29569c4753ec887a505164d md5sums = 4967385a00db424e596263618335411f md5sums = cf971cb2cb01d8a5fd89d3a3555abfaf md5sums = 6b159c6e9d21a98925489bc37a9aea43 @@ -2,15 +2,17 @@ # pkgname=wechat-beta-bwrap pkgver=1.0.0.145 -pkgrel=11 +pkgrel=12 uosver=2.1.5 epoch= pkgdesc="WeChat Testing with bwrap sandbox" arch=('x86_64') url="" license=('proprietary') +conflicts=('wechat-uos') groups=() -depends=('nss' 'xdg-utils' 'libxss' 'libnotify' 'bubblewrap' 'xdg-desktop-portal' 'openssl-1.1' 'lsb-release') +depends=('nss' 'xdg-utils' 'libxss' 'libnotify' 'bubblewrap' + 'xdg-user-dirs' 'xdg-desktop-portal' 'openssl-1.1' 'lsb-release') source=( wechat.sh wechat-beta.desktop @@ -25,7 +27,7 @@ noextract=( wechat-beta_${pkgver}_amd64.deb ) -md5sums=('5bbe5144ec0623faf514b7a191163fac' +md5sums=('222a2eb9b29569c4753ec887a505164d' '4967385a00db424e596263618335411f' 'cf971cb2cb01d8a5fd89d3a3555abfaf' '6b159c6e9d21a98925489bc37a9aea43' diff --git a/wechat.sh b/wechat.sh index 899a6e3320e7..e7ddf62e4217 100644 --- a/wechat.sh +++ b/wechat.sh @@ -2,12 +2,13 @@ # wechat-beta only support xcb BWRAP_ENV_APPEND="--setenv QT_QPA_PLATFORM xcb " +WECHAT_HOME_DIR="$(xdg-user-dir DOCUMENTS)/WeChat_Data" if [ -z ${QT_IM_MODULE} ]; then BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_IM_MODULE fcitx" fi -if [ -z ${QT_SCALE_FACTOR} ]; then +if [ -z ${QT_SCALE_FACTOR} ] && [ -z ${QT_AUTO_SCREEN_SCALE_FACTOR} ]; then BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_SCALE_FACTOR 1.5" fi @@ -15,13 +16,13 @@ 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 +if [ ! -d "${WECHAT_HOME_DIR}" ]; then + mkdir -p ${WECHAT_HOME_DIR} fi exec bwrap \ --dev-bind / / \ - --bind ${HOME}/Documents/WeChat_Data ${HOME} \ + --bind ${WECHAT_HOME_DIR} ${HOME} \ --ro-bind /usr/share/wechat-uos/var/ /var/ \ --ro-bind /usr/share/wechat-uos/etc/os-release /etc/os-release \ --ro-bind /usr/share/wechat-uos/etc/lsb-release /etc/lsb-release \ |