aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCodist2020-11-27 18:14:45 +0800
committerCodist2020-11-27 18:14:45 +0800
commit533b07a0c945fbe56e308a1c9c69f8970000820f (patch)
tree0e006dec7400abe1ad7fba8bb64500224591769f
parent3b8973bea71c808654660613cea50c90913dd7f2 (diff)
downloadaur-533b07a0c945fbe56e308a1c9c69f8970000820f.tar.gz
set the deepin package mirror to 'http://packages.deepin.com'
Signed-off-by: Codist <countstarlight@gmail.com>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--README.md2
-rwxr-xr-xrun.sh11
4 files changed, 14 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2cec66595b49..ac6ceef2dd36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,13 +21,13 @@ pkgbase = deepin-wine-tim
conflicts = wine-tim
conflicts = deepin.com.qq.office
conflicts = deepin-tim-for-arch
- source = https://ftp.sjtu.edu.cn/deepin/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_2.0.0deepin4_i386.deb
+ source = http://packages.deepin.com/deepin/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_2.0.0deepin4_i386.deb
source = https://dldir1.qq.com/qqfile/qq/PCTIM/TIM3.2.0/TIM3.2.0.21856.exe
source = run.sh
source = reg.patch
md5sums = d5c37cb4f960e13111ce24dbc0dd2d58
md5sums = 534c33e25dfa6360f710e5df4f3da1dd
- md5sums = 2f01b7e2e707d6f246ffda76c2d11e53
+ md5sums = dbb4a2773f41c3e7ed56fea650884560
md5sums = d049e1171da0dc82c951b07cc534c39d
pkgname = deepin-wine-tim
diff --git a/PKGBUILD b/PKGBUILD
index ca45d6010579..bd65f52b0b6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,14 @@ license=('custom')
depends=('p7zip' 'wine' 'wine-mono' 'wine-gecko' 'xorg-xwininfo' 'wqy-microhei' 'lib32-alsa-lib' 'lib32-alsa-plugins' 'lib32-libpulse' 'lib32-openal' 'lib32-mpg123' 'lib32-gnutls')
conflicts=('wine-tim' 'deepin.com.qq.office' 'deepin-tim-for-arch')
install="deepin-wine-tim.install"
-_mirror="https://ftp.sjtu.edu.cn/deepin"
+_mirror="http://packages.deepin.com/deepin"
source=("$_mirror/pool/non-free/d/deepin.com.qq.office/deepin.com.qq.office_${deepintimver}_i386.deb"
"https://dldir1.qq.com/qqfile/qq/PCTIM/TIM3.2.0/TIM${pkgver}.exe"
"run.sh"
"reg.patch")
md5sums=('d5c37cb4f960e13111ce24dbc0dd2d58'
'534c33e25dfa6360f710e5df4f3da1dd'
- '2f01b7e2e707d6f246ffda76c2d11e53'
+ 'dbb4a2773f41c3e7ed56fea650884560'
'd049e1171da0dc82c951b07cc534c39d')
build() {
diff --git a/README.md b/README.md
index ef77ec5968b3..efc5ca868af4 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ env WINEPREFIX="$WINEPREFIX" WINEDEBUG=-msvcrt $WINE_CMD "c:\\Program Files\\Ten
/opt/deepinwine/apps/Deepin-TIM/run.sh -d
```
-这会安装需要的依赖,移除已安装的TIM目录并回退对注册表文件的修改
+这会安装需要的依赖,移除已安装的 TIM 目录并回退对注册表文件的修改
切换回 `wine`:
diff --git a/run.sh b/run.sh
index 1a14fa2011b5..7b5b67d96c63 100755
--- a/run.sh
+++ b/run.sh
@@ -120,8 +120,14 @@ SwitchToDeepinWine()
if [ "$XDG_CURRENT_DESKTOP" = "Deepin" ]; then
DEEPIN_WINE_DEPENDS="${DEEPIN_WINE_DEPENDS} lib32-freetype2-infinality-ultimate"
fi
- msg 0 "Installing dependencies: ${DEEPIN_WINE_DEPENDS} ..."
- $PACKAGE_MANAGER -S ${DEEPIN_WINE_DEPENDS} --needed
+ for p in ${DEEPIN_WINE_DEPENDS}; do
+ if pacman -Qs $p > /dev/null ; then
+ msg 0 "$p is installed, skip ..."
+ else
+ msg 0 "Installing dependency: $p ..."
+ $PACKAGE_MANAGER -S $p
+ fi
+ done
msg 0 "Redeploying app ..."
if [ -d "$WINEPREFIX" ]; then
RemoveApp
@@ -132,6 +138,7 @@ SwitchToDeepinWine()
msg 0 "Creating flag file '$WINEPREFIX/deepin' ..."
touch -f $WINEPREFIX/deepin
msg 0 "Done."
+ exit 0
}
# Init