From d9bb23c221a375147bdbfca2821cf1405dd33247 Mon Sep 17 00:00:00 2001 From: Codist Date: Thu, 18 Feb 2021 15:57:40 +0800 Subject: [PATCH] Fixed travis-ci build and add winecfg shortcut to run.sh Signed-off-by: Codist --- .SRCINFO | 2 +- .travis.yml | 9 +++++---- PKGBUILD | 2 +- README.md | 13 +++---------- run.sh | 13 +++++++++++++ 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 60ef6ac..fafedf1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -27,7 +27,7 @@ pkgbase = deepin-wine-tim source = share.7z md5sums = 5fdc20e614d945bd2ba5251420872479 md5sums = 07fe0f065594b90673ab28d7388017d4 - md5sums = 3dcb24166e65ebbba4ba9a535402b34a + md5sums = 1a13ad93f5233047adb3228ceed7d620 md5sums = 479ae2a04a9c5dcc08c67c7b1395a944 pkgname = deepin-wine-tim diff --git a/.travis.yml b/.travis.yml index 9f378bf..b31ca73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ -sudo: required +arch: amd64 +os: linux +dist: focal services: - docker @@ -24,13 +26,12 @@ archlinux: - "./gen.sh -m" script: -- "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash" +- "curl -s https://raw.githubusercontent.com/countstarlight/arch-travis/master/arch-travis.sh | bash" deploy: provider: releases - skip_cleanup: true overwrite: true - api_key: $GH_TOKEN + token: $GH_TOKEN file_glob: true file: - "deepin-wine-tim*.pkg*" diff --git a/PKGBUILD b/PKGBUILD index 906bd5e..6c1fbea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,7 +20,7 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${debpkgv "share.7z") md5sums=('5fdc20e614d945bd2ba5251420872479' '07fe0f065594b90673ab28d7388017d4' - '3dcb24166e65ebbba4ba9a535402b34a' + '1a13ad93f5233047adb3228ceed7d620' '479ae2a04a9c5dcc08c67c7b1395a944') build() { diff --git a/README.md b/README.md index 6ad88a9..3769d1b 100644 --- a/README.md +++ b/README.md @@ -112,18 +112,10 @@ EXEC_PATH="c:/Program Files/Tencent/TIM/Bin/TIM.exe" ## 设置 -> dpi,目录映射等可以在 `winecfg` 进行设置 - -如果使用默认的 `wine`,打开 `winecfg` 的命令为: - -```bash -env WINEPREFIX="$HOME/.deepinwine/Deepin-TIM" winecfg -``` - -如果已经[切换到 `deepin-wine`](#切换到-deepin-wine),打开 `winecfg` 的命令为: +dpi,目录映射等可以在 `winecfg` 进行设置,打开 `winecfg` 的命令为: ```bash -env WINEPREFIX="$HOME/.deepinwine/Deepin-TIM" deepin-wine5 winecfg +/opt/apps/com.qq.office.deepin/files/run.sh winecfg ``` ## 兼容性记录 @@ -235,6 +227,7 @@ TIM在本地保存的数据不会被删除,如保存在用户文档下的数
2021 +* 2021-02-11 TIM-3.3.0.22020 com.qq.im.deepin_9.3.2deepin20 * 2021-02-03 TIM-3.3.0.22020 com.qq.im.deepin_9.3.2deepin14
diff --git a/run.sh b/run.sh index 16cf0cc..2b64024 100755 --- a/run.sh +++ b/run.sh @@ -86,6 +86,15 @@ SwitchToDeepinWine() exit 0 } +OpenWinecfg() +{ + if [ -f "$WINEPREFIX/deepin" ]; then + env WINEPREFIX=$WINEPREFIX deepin-wine5 winecfg + else + env WINEPREFIX=$WINEPREFIX winecfg + fi +} + Run() { extract_archive "$ARCHIVE_FILE_DIR/helper_archive.7z" "$ARCHIVE_FILE_DIR/helper_archive.md5sum" "$SPECIFY_SHELL_DIR" @@ -109,6 +118,7 @@ Run() HelpApp() { echo " Extra Commands:" + echo " winecfg Open winecfg" echo " -d/--deepin Switch to 'deepin-wine'" echo " -h/--help Show program help info" } @@ -129,6 +139,9 @@ if [ -z $1 ]; then exit 0 fi case $1 in + "winecfg") + OpenWinecfg + ;; "-d" | "--deepin") SwitchToDeepinWine ;;