aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCountStarlight2017-12-19 17:19:24 +0800
committerCountStarlight2017-12-19 17:19:24 +0800
commit8333ad8d6944f3593b910d5dddb974a94f4f782a (patch)
treeccc42f7c5f3a0d71adf3231a60ae1784e33effaf
parentb0f56840ee0ad3a962a29b01f92b06f35912c921 (diff)
downloadaur-8333ad8d6944f3593b910d5dddb974a94f4f782a.tar.gz
Update run.sh and remove useless scripts.
Signed-off-by: CountStarlight <countstarlight@gmail.com>
-rw-r--r--.SRCINFO2
-rw-r--r--.travis.yml21
-rw-r--r--PKGBUILD3
-rw-r--r--README.md11
-rwxr-xr-x[-rw-r--r--]run.sh15
5 files changed, 46 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dc7ae03289b8..05f66cb7627f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,7 +28,7 @@ pkgbase = deepin-wine-tim
source = update.policy
md5sums = 2547a4c81ce90c031222564911892f29
md5sums = 53d2bd63163e849ab8bbc89b5440bfc6
- md5sums = 1f533f05f918a3e8bac7a71fb0a13cc6
+ md5sums = afa7a757871ff163b30cb06b0ad61956
md5sums = ebde755e3bd213550f5ccc69d3192060
md5sums = a66646b473a3fbad243ac1afd64da07a
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000000..e2519e0f7895
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,21 @@
+sudo: required
+
+arch:
+ packages:
+ - p7zip
+ - wine
+ - wine-mono
+ - wine_gecko
+ - xorg-xwininfo
+ - xdotool
+ - wqy-microhei
+ - adobe-source-han-sans-cn-fonts
+ - lib32-alsa-lib
+ - lib32-alsa-plugins
+ - lib32-libpulse
+ - lib32-openal
+ script:
+ - "makepkg"
+
+script:
+ - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"
diff --git a/PKGBUILD b/PKGBUILD
index 2e8b3aa9d071..3e8eefee2f06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ source=("$_mirror/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_${de
"update.policy")
md5sums=('2547a4c81ce90c031222564911892f29'
'53d2bd63163e849ab8bbc89b5440bfc6'
- '1f533f05f918a3e8bac7a71fb0a13cc6'
+ 'afa7a757871ff163b30cb06b0ad61956'
'ebde755e3bd213550f5ccc69d3192060'
'a66646b473a3fbad243ac1afd64da07a')
@@ -47,7 +47,6 @@ build() {
package() {
msg "Preparing icons ..."
- sed -i '9s#.*#Exec="/opt/deepinwine/apps/Deepin-TIM/run.sh"#' "${srcdir}/dpkgdir/usr/local/share/applications/deepin.com.qq.office.desktop"
install -d "${pkgdir}/usr/share"
cp -a ${srcdir}/dpkgdir/usr/local/share/* "${pkgdir}/usr/share/"
msg "Copying TIM to /opt/deepinwine/apps/Deepin-TIM ..."
diff --git a/README.md b/README.md
index 216e787c313f..9a61ab51df31 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
# 在arch以及衍生版本上运行TIM
-   把deepin打包的TIM容器移植到arch
+把deepin打包的TIM容器移植到arch
+
+构建状态: ![https://github.com/countstarlight/deepin-wine-tim-arch](https://travis-ci.org/countstarlight/deepin-wine-tim-arch.svg?branch=master)
感谢:
* @[wszqkzqk](https://github.com/wszqkzqk) 的 [wszqkzqk-deepin-wine-tim-arch](https://github.com/wszqkzqk/wszqkzqk-deepin-wine-tim-arch)
@@ -29,8 +31,11 @@ yaourt deepin-wine-tim
* 运行开始菜单中创建的TIM,点击立即安装
* 安装完可直接启动,以后启动时无需安装
-
+## 常见问题
+* 1.解决在 2k/4k 屏幕下字体和图标都非常小, 参见[issue1](https://github.com/countstarlight/deepin-wine-tim-arch/issues/1)
+* 2.使用全局截图快捷键和解决Gnome上窗口化问题,参见[issue2](https://github.com/countstarlight/deepin-wine-tim-arch/issues/2)
## 更新日志
-2017-11-21 TIM-2.0.0
+* 2017-11-28 修复音频功能(麦克风录音和播放语音消息)
+* 2017-11-21 TIM-2.0.0
使用文泉驿微米黑(wqy-microhei)字体,如果不喜欢这个字体,可以自行将微软雅黑或者微软宋体放进~/.deepinwine/Deepin-TIM/drive_c/windows/Fonts中。
diff --git a/run.sh b/run.sh
index 2db25c0511b6..760bcd5f7bde 100644..100755
--- a/run.sh
+++ b/run.sh
@@ -81,6 +81,15 @@ RunApp()
CallApp
}
+CreateBottle()
+{
+ if [ -d "$WINEPREFIX" ]; then
+ UpdateApp
+ else
+ DeployApp
+ fi
+}
+
if [ -z $1 ]; then
RunApp
exit 0
@@ -89,9 +98,15 @@ case $1 in
"-r" | "--reset")
ResetApp
;;
+ "-c" | "--create")
+ CreateBottle
+ ;;
"-e" | "--remove")
RemoveApp
;;
+ "-u" | "--uri")
+ RunApp $2
+ ;;
"-h" | "--help")
HelpApp
;;