aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCodist2021-02-21 22:35:25 +0800
committerCodist2021-02-21 22:35:25 +0800
commit519c38377fe57f8a4a12040c13d45d09a42db3cc (patch)
treedcfbb89bf87053d972873e81fd66c80e28d9105a
parent09e4648f8f0a7e4badb455c8f71a2c06654c1a14 (diff)
downloadaur-519c38377fe57f8a4a12040c13d45d09a42db3cc.tar.gz
Add winecfg shortcut to run.sh
Signed-off-by: Codist <countstarlight@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--.travis.yml6
-rw-r--r--PKGBUILD2
-rw-r--r--README.md26
-rwxr-xr-xrun.sh13
5 files changed, 28 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 83ee5d52354b..7496e802b72b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,7 +23,7 @@ pkgbase = deepin-wine-wechat
source = run.sh
md5sums = 42794ec8f1e61407e670f1382a0d72db
md5sums = c09d13e6effb9c85d731837e553df0fa
- md5sums = 5344fef8d3dc4311738a64ad8b2bf014
+ md5sums = b4b4893ab28204f7c24c1c8a888e9801
pkgname = deepin-wine-wechat
diff --git a/.travis.yml b/.travis.yml
index 01642c6a81d9..296dcc86c57e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
-sudo: required
+arch: amd64
+os: linux
+dist: focal
services:
- docker
@@ -29,7 +31,7 @@ deploy:
provider: releases
skip_cleanup: true
overwrite: true
- api_key: $GH_TOKEN
+ token: $GH_TOKEN
file_glob: true
file:
- "deepin-wine-wechat*.pkg*"
diff --git a/PKGBUILD b/PKGBUILD
index fd5df5295e86..294d4c5b9904 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${deepinw
"run.sh")
md5sums=('42794ec8f1e61407e670f1382a0d72db'
'c09d13e6effb9c85d731837e553df0fa'
- '5344fef8d3dc4311738a64ad8b2bf014')
+ 'b4b4893ab28204f7c24c1c8a888e9801')
build() {
msg "Extracting DPKG package ..."
diff --git a/README.md b/README.md
index 70c6bbda4f74..721e5c6e3405 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,21 @@
在Archlinux及衍生发行版上运行微信(WeChat)
-=======
+========
<p align="center">
<a href="https://travis-ci.org/countstarlight/deepin-wine-wechat-arch">
- <img src="https://travis-ci.org/countstarlight/deepin-wine-wechat-arch.svg?branch=master" alt="Build Status">
+ <img src="https://img.shields.io/travis/countstarlight/deepin-wine-wechat-arch?&logo=travis&style=flat-square" alt="Build Status">
</a>
<a href="https://pc.weixin.qq.com/">
- <img src="https://img.shields.io/badge/WeChat-3.1.0.72-blue.svg" alt="WeChat Version">
+ <img src="https://img.shields.io/badge/WeChat-3.1.0.72-blue?style=flat-square&logo=wechat" alt="WeChat Version">
</a>
<a href="https://aur.archlinux.org/packages/deepin-wine-wechat/">
- <img src="https://img.shields.io/aur/version/deepin-wine-wechat.svg" alt="AUR Version">
+ <img src="https://img.shields.io/aur/version/deepin-wine-wechat?label=AUR&logo=arch-linux&style=flat-square" alt="AUR Version">
</a>
<a href="https://github.com/countstarlight/deepin-wine-wechat-arch/releases">
- <img src="https://img.shields.io/github/downloads/countstarlight/deepin-wine-wechat-arch/total.svg" alt="GitHub Release">
+ <img src="https://img.shields.io/github/downloads/countstarlight/deepin-wine-wechat-arch/total?logo=github&style=flat-square" alt="GitHub Release">
</a>
<a href="https://github.com/countstarlight/deepin-wine-wechat-arch/issues">
- <img src="https://img.shields.io/github/issues/countstarlight/deepin-wine-wechat-arch.svg" alt="GitHub Issues">
+ <img src="https://img.shields.io/github/issues/countstarlight/deepin-wine-wechat-arch?logo=github&style=flat-square" alt="GitHub Issues">
</a>
</p>
@@ -67,7 +67,7 @@ Deepin打包的微信容器(`com.qq.weixin.deepin`)移植到Archlinux,不依
### 从AUR安装
-已添加到AUR [deepin-wine-wechat](https://aur.archlinux.org/packages/deepin-wine-wechat/),可使用 `yay` 或 `yaourt` 安装:
+已添加到 AUR [deepin-wine-wechat](https://aur.archlinux.org/packages/deepin-wine-wechat/),可使用 `yay` 或 `yaourt` 安装:
```shell
yay -S deepin-wine-wechat
@@ -112,18 +112,10 @@ EXEC_PATH="c:/Program Files/Tencent/WeChat/WeChat.exe"
## 设置
-> dpi,目录映射等可以在 `winecfg` 进行设置
-
-如果使用默认的 `wine`,打开 `winecfg` 的命令为:
-
-```bash
-env WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat" winecfg
-```
-
-如果已经[切换到 `deepin-wine`](#切换到-deepin-wine),打开 `winecfg` 的命令为:
+dpi,目录映射等可以在 `winecfg` 进行设置,打开 `winecfg` 的命令为:
```bash
-env WINEPREFIX="$HOME/.deepinwine/Deepin-WeChat" deepin-wine5 winecfg
+/opt/apps/com.qq.weixin.deepin/files/run.sh winecfg
```
## 兼容性记录
diff --git a/run.sh b/run.sh
index 355a3ee364c6..68a8de79adaf 100755
--- a/run.sh
+++ b/run.sh
@@ -85,6 +85,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"
@@ -108,6 +117,7 @@ Run()
HelpApp()
{
echo " Extra Commands:"
+ echo " winecfg Open winecfg"
echo " -d/--deepin Switch to 'deepin-wine'"
echo " -h/--help Show program help info"
}
@@ -128,6 +138,9 @@ if [ -z $1 ]; then
exit 0
fi
case $1 in
+ "winecfg")
+ OpenWinecfg
+ ;;
"-d" | "--deepin")
SwitchToDeepinWine
;;