Skip to content
This repository has been archived by the owner on Jan 20, 2023. It is now read-only.

Commit

Permalink
Fixed travis-ci build and add winecfg shortcut to run.sh
Browse files Browse the repository at this point in the history
Signed-off-by: Codist <countstarlight@gmail.com>
  • Loading branch information
vufa committed Feb 18, 2021
1 parent d5b6d92 commit d9bb23c
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .SRCINFO
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
sudo: required
arch: amd64
os: linux
dist: focal

services:
- docker
Expand All @@ -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*"
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${debpkgv
"share.7z")
md5sums=('5fdc20e614d945bd2ba5251420872479'
'07fe0f065594b90673ab28d7388017d4'
'3dcb24166e65ebbba4ba9a535402b34a'
'1a13ad93f5233047adb3228ceed7d620'
'479ae2a04a9c5dcc08c67c7b1395a944')

build() {
Expand Down
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

## 兼容性记录
Expand Down Expand Up @@ -235,6 +227,7 @@ TIM在本地保存的数据不会被删除,如保存在用户文档下的数
<details open>
<summary>2021</summary>

* 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

</details>
Expand Down
13 changes: 13 additions & 0 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
}
Expand All @@ -129,6 +139,9 @@ if [ -z $1 ]; then
exit 0
fi
case $1 in
"winecfg")
OpenWinecfg
;;
"-d" | "--deepin")
SwitchToDeepinWine
;;
Expand Down

0 comments on commit d9bb23c

Please sign in to comment.