diff options
| author | Kimiblock Moe | 2024-04-15 23:04:21 +0800 |
|---|---|---|
| committer | Kimiblock Moe | 2024-04-15 23:04:21 +0800 |
| commit | 05fa2b44e927a31e43f0f821d2c3f3084467f474 (patch) | |
| tree | a3a1617056c9c023c19ba3a9abb48b23bc08d12b | |
| parent | b681112c3ebb5354d457a9fed746bc927f0e1663 (diff) | |
| download | aur-05fa2b44e927a31e43f0f821d2c3f3084467f474.tar.gz | |
Fix dir management
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | user-dirs.dirs | 8 | ||||
| -rw-r--r-- | wechat.sh | 11 |
3 files changed, 22 insertions, 6 deletions
@@ -1,7 +1,7 @@ # Maintainer: Kimiblock Moe pkgname=(wechat-uos-bwrap wechat-uos-qt) pkgver=1.0.0.238 -pkgrel=7 +pkgrel=8 epoch= pkgdesc="WeChat Qt w/ bwrap sandbox" arch=('x86_64' 'aarch64' 'loong64') @@ -69,6 +69,7 @@ source=( wechat-uos-beta.svg open.sh license.tar.gz + user-dirs.dirs ) source_x86_64=( @@ -83,11 +84,12 @@ source_loong64=( wechat-loong64-${pkgver}.deb::"https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_1.0.0.238_arm64.deb" ) -md5sums=('2a42053a384065038a32d02688610234' +md5sums=('d053f0e6c2cf50a5a6dbf34a9bd1fba9' '14b090b2a38396406e7fc8cc09be74bb' '600e74549ce2258c045d5c2f7689ea63' 'e49130d3e6185335db9a60f31d4b7429' - '6b159c6e9d21a98925489bc37a9aea43') + '6b159c6e9d21a98925489bc37a9aea43' + '38e98220da64adc1d8f9dc17d04b3a39') md5sums_x86_64=('aa52e39afd9c16eee7f924093ce4c5b6') md5sums_aarch64=('280d9b202390954c011dbd12e28f892d') md5sums_loong64=('280d9b202390954c011dbd12e28f892d') @@ -100,6 +102,7 @@ function package_wechat-uos-qt() { cp opt/apps/com.tencent.wechat "${pkgdir}"/opt/wechat-uos-qt -r install -Dm644 wechat-uos-beta.desktop "${pkgdir}/usr/share/applications/wechat-uos-qt.desktop" install -Dm755 wechat.sh "${pkgdir}/usr/bin/wechat-uos-qt" + install -Dm644 user-dirs.dirs "${pkgdir}/usr/lib/wechat-uos-qt/user-dirs.dirs" install -Dm755 open.sh "${pkgdir}/usr/lib/wechat-uos-qt/open" install -Dm644 wechat-uos-beta.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/wechat-uos-qt.svg" mkdir -p "${pkgdir}/usr/share/wechat-uos-qt/license" diff --git a/user-dirs.dirs b/user-dirs.dirs new file mode 100644 index 000000000000..4356ac10ae28 --- /dev/null +++ b/user-dirs.dirs @@ -0,0 +1,8 @@ +XDG_DESKTOP_DIR="$HOME/Desktop" +XDG_DOWNLOAD_DIR="$HOME/Downloads" +XDG_TEMPLATES_DIR="$HOME/Templates" +XDG_PUBLICSHARE_DIR="$HOME/Public" +XDG_DOCUMENTS_DIR="$HOME/Documents" +XDG_MUSIC_DIR="$HOME/Music" +XDG_PICTURES_DIR="$HOME/Pictures" +XDG_VIDEOS_DIR="$HOME/Videos" diff --git a/wechat.sh b/wechat.sh index 53fbe71320da..91742433cda4 100644 --- a/wechat.sh +++ b/wechat.sh @@ -26,6 +26,10 @@ function manageDirs() { if [ -d "${HOME}/Documents/TrashBox" ]; then echo "[Warn] Old user data may be present, check ${HOME}/Documents/TrashBox" fi + if [ -d "${XDG_DOCUMENTS_DIR}/WeChat_Data/文档" ]; then + mv "${XDG_DOCUMENTS_DIR}/WeChat_Data/文档" \ + "${XDG_DOCUMENTS_DIR}/WeChat_Data/Documents" + fi } function detectXauth() { @@ -62,8 +66,9 @@ function lnDir() { ln -s "${XDG_DOCUMENTS_DIR}"/WeChat_Data/xwechat_files \ "${HOME}"/xwechat_files fi - ln -sf "${XDG_DOCUMENTS_DIR}"/WeChat_Data/Documents/xwechat_files \ - "${XDG_DOCUMENTS_DIR}"/xwechat_files + cd "${XDG_DOCUMENTS_DIR}" + ln -sf WeChat_Data/Documents/xwechat_files \ + xwechat_files } function importEnv() { @@ -123,7 +128,7 @@ function execApp() { "${osRel}" \ --ro-bind /usr/share/wechat-uos-qt/license/etc/lsb-release \ /etc/lsb-release \ - --ro-bind-try "${XDG_CONFIG_HOME}"/user-dirs.dirs \ + --ro-bind /usr/lib/wechat-uos-qt/user-dirs.dirs \ "${XDG_CONFIG_HOME}"/user-dirs.dirs \ --ro-bind-try "${XDG_CONFIG_HOME}"/fontconfig \ "${XDG_CONFIG_HOME}"/fontconfig \ |