[fix] 修复了错误地挂载整个主目录的问题。

This commit is contained in:
Yidaozhan Ya 2022-12-29 19:49:01 +08:00
parent 99f65cb491
commit 093db73bd7
3 changed files with 7 additions and 6 deletions

View file

@ -1,7 +1,7 @@
pkgbase = linuxqq-nt-bwrap
pkgdesc = Tencent QQ NT for Linux with bubblewrap wrapper
pkgver = 3.0.0_565
pkgrel = 2
pkgrel = 23
url = https://im.qq.com
install = linuxqq.install
arch = x86_64
@ -28,7 +28,7 @@ pkgbase = linuxqq-nt-bwrap
source = start.sh
source = config.json
source = qq_channel_jsbridge_handler.desktop
sha256sums = 4ad245e7c62bb40a495404972c15967dd8c314daa46fa937b31ca245026da459
sha256sums = 3aeed7e5049f644d99d9469630985e90a0c6ed627a435f4d81fae9af434faa7b
sha256sums = 68069b9360c09a5e64c370dbcba54089ac4b1f8b30fc3d6d1c9b8b316a8f92c6
sha256sums = e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df
source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/50eed662/QQ-v2.0.3-543_x64.deb

View file

@ -2,7 +2,7 @@
_pkgname=linuxqq
pkgname=linuxqq-nt-bwrap
pkgver=3.0.0_565
pkgrel=2
pkgrel=2\3
pkgdesc="Tencent QQ NT for Linux with bubblewrap wrapper"
arch=('x86_64' 'aarch64')
url='https://im.qq.com'
@ -23,7 +23,7 @@ sha256sums_x86_64=('3bccda547b7fa17b1eacf5477bfafaa4016958578b0d5b2269ace0697ee4
'814ddc3eea99bf2e291e2eeff0c3805928e3059e23b12d41cc8bf75bb8cd5fd3') # 热更新补丁
sha256sums_aarch64=('d356697284837396f430228032ad7a378717cdba2e1cd724386b2ff99e1eb7bc' # 本体
'f2f61581a5c09e4a7bfb23922a667e8df327d58fed9601034c4b60a08ad29049') # 热更新补丁
sha256sums=('4ad245e7c62bb40a495404972c15967dd8c314daa46fa937b31ca245026da459' # start.sh
sha256sums=('3aeed7e5049f644d99d9469630985e90a0c6ed627a435f4d81fae9af434faa7b' # start.sh
'68069b9360c09a5e64c370dbcba54089ac4b1f8b30fc3d6d1c9b8b316a8f92c6' # config.json
'e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df') # qq_channel_jsbridge_handler.desktop
@ -35,8 +35,8 @@ package() {
chmod 755 "${pkgdir}/opt/QQ/resources/app"
# 打包相关处理
install -Dm644 "qq_channel_jsbridge_handler.desktop" "${pkgdir}/usr/share/applications/qq_channel_jsbridge_handler.desktop"
mkdir -p "${pkgdir}/opt/QQ/workarounds"
install -Dm644 "qq_channel_jsbridge_handler.desktop" "${pkgdir}/opt/QQ/workarounds/qq_channel_jsbridge_handler.desktop"
cp "${srcdir}/config.json" "${pkgdir}/opt/QQ/workarounds/config.json"

View file

@ -10,7 +10,7 @@ QQ_HOTUPDATE_DIR="${QQ_APP_DIR}/versions"
QQ_HOTUPDATE_VERSION="3.0.0-565"
QQ_PREVIOUS_VERSIONS=("2.0.1-429" "2.0.1-453" "2.0.2-510" "2.0.3-543")
if [ "${DOWNLOAD_DIR}" == "${HOME}" ]; then
if [ "${DOWNLOAD_DIR%*/}" == "${HOME}" ]; then
DOWNLOAD_DIR="${HOME}/Downloads"
if [ ! -e "${DOWNLOAD_DIR}" ]; then mkdir -p "${DOWNLOAD_DIR}"; fi
fi
@ -54,6 +54,7 @@ bwrap --new-session --die-with-parent --cap-drop ALL --unshare-user-try --unshar
--ro-bind-try "${XAUTHORITY}" "${XAUTHORITY}" \
--bind-try "${DOWNLOAD_DIR}" "${DOWNLOAD_DIR}" \
--bind "${QQ_APP_DIR}" "${QQ_APP_DIR}" \
--symlink opt/QQ/workarounds/qq_channel_jsbridge_handler.desktop "$HOME/.local/share/applications/qq_channel_jsbridge_handler.desktop" \
--setenv IBUS_USE_PORTAL 1 \
--setenv DISPLAY "${NEW_DISPLAY}" \
/opt/QQ/qq "$@"