summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD15
-rw-r--r--deepin-wine-xiguavideo.install6
-rw-r--r--deepin-wine-xiguavideo.sh31
4 files changed, 26 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d864586a7c8f..7c2a44e79b66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
pkgbase = deepin-wine-xiguavideo
pkgdesc = XiGua Video on Deepin Wine 6
- pkgver = 1.0.7
- pkgrel = 3
+ pkgver = 1.0.9
+ pkgrel = 1
url = https://www.ixigua.com
install = deepin-wine-xiguavideo.install
arch = x86_64
- license = custom:freeware
+ license = LicenseRef-freeware
makedepends = p7zip
depends = deepin-wine6-stable
depends = spark-dwine-helper
depends = xdg-utils
optdepends = wqy-zenhei
optdepends = wqy-microhei
- provides = xiguavideo=1.0.7
+ provides = xiguavideo=1.0.9
conflicts = xiguavideo
conflicts = deepin-wine-xiguavideo
- noextract = xiguavideo-1.0.7.exe
+ noextract = xiguavideo-1.0.9.exe
source = deepin-wine-xiguavideo-1.0.6spark1.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/com.ixigua.xigua-video.spark/com.ixigua.xigua-video.spark_1.0.6spark1_amd64.deb
- source = xiguavideo-1.0.7.exe::https://lf-xigua-pc.ixigua.com/obj/xigua-video-electron/6922326164589517070/releases/11210180/1.0.7/win32/xigua-video-1.0.7-default.exe
+ source = xiguavideo-1.0.9.exe::https://lf-xigua-pc.ixigua.com/obj/xigua-video-electron/6922326164589517070/releases/11463809/1.0.9/win32/xigua-video-1.0.9-default.exe
source = LICENSE.html
source = deepin-wine-xiguavideo.sh
sha256sums = 18b2277ea23d6a61d45197b422b99a53e7f5f5e2764f1f5616443984598af321
- sha256sums = f3b4277641de91d3838ede96a56e25257ea869b382cda40ae1c7b53dba4e98a7
+ sha256sums = 555761bb662ca4268c737e198937de1a3ba722b44707a6f5ce605445cfaa09c2
sha256sums = 37bfde6970ae8f7575aa29b1146a5662e0780f6ceb5b99128bca6ae6ebdc0b09
- sha256sums = 40722a2e7ecc0970eee168a17dae328c4da20b492fa759b15a5f11e76b10736b
+ sha256sums = 5dc00208bef4da3d30f261f64696eebe44648bc013de3442482896fb02ffbe2e
pkgname = deepin-wine-xiguavideo
diff --git a/PKGBUILD b/PKGBUILD
index 68c8fa59f820..88423f5c7e6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@ _bottlename=Deepin-XiguaVideo
pkgname="deepin-wine-${_appname}"
_pkgname=com.ixigua.xigua-video.spark
_zhsname="西瓜视频"
-pkgver=1.0.7
+pkgver=1.0.9
_deepinver=1.0.6spark1
-pkgrel=3
+pkgrel=1
pkgdesc="XiGua Video on Deepin Wine 6"
arch=('x86_64')
url="https://www.ixigua.com"
-license=('custom:freeware')
+license=('LicenseRef-freeware')
conflicts=(
"${_appname}"
"${pkgname}"
@@ -32,22 +32,21 @@ noextract=("${_appname}-${pkgver}.exe")
install="${pkgname}.install"
source=(
"${pkgname}-${_deepinver}.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/${_pkgname}/${_pkgname}_${_deepinver}_amd64.deb"
- "${_appname}-${pkgver}.exe::https://lf-xigua-pc.ixigua.com/obj/xigua-video-electron/6922326164589517070/releases/11210180/${pkgver}/win32/xigua-video-${pkgver}-default.exe"
+ "${_appname}-${pkgver}.exe::https://lf-xigua-pc.ixigua.com/obj/xigua-video-electron/6922326164589517070/releases/11463809/${pkgver}/win32/xigua-video-${pkgver}-default.exe"
"LICENSE.html"
"${pkgname}.sh"
)
sha256sums=('18b2277ea23d6a61d45197b422b99a53e7f5f5e2764f1f5616443984598af321'
- 'f3b4277641de91d3838ede96a56e25257ea869b382cda40ae1c7b53dba4e98a7'
+ '555761bb662ca4268c737e198937de1a3ba722b44707a6f5ce605445cfaa09c2'
'37bfde6970ae8f7575aa29b1146a5662e0780f6ceb5b99128bca6ae6ebdc0b09'
- '40722a2e7ecc0970eee168a17dae328c4da20b492fa759b15a5f11e76b10736b')
+ '5dc00208bef4da3d30f261f64696eebe44648bc013de3442482896fb02ffbe2e')
build() {
- sed "s|@bottlename@|${_bottlename}|g" -i "${srcdir}/${pkgname}.install"
sed -e "s|@bottlename@|${_bottlename}|g" \
-e "s|@appver@|${pkgver}|g" \
-e "s|@packagename@|${pkgname}|g" \
-e "s|@zhsname@|${_zhsname}|g" \
-i "${srcdir}/${pkgname}.sh"
- bsdtar -xf "${srcdir}/data.tar.xz"
+ bsdtar -xf "${srcdir}/data."*
mv "${srcdir}/opt/apps/${_pkgname}" "${srcdir}/opt/apps/${pkgname}"
mkdir -p "${srcdir}/tmp" "${srcdir}/temp"
msg "Extracting Deepin Wine ${_appname} archive ..."
diff --git a/deepin-wine-xiguavideo.install b/deepin-wine-xiguavideo.install
index 70420768367c..627ddc58ae48 100644
--- a/deepin-wine-xiguavideo.install
+++ b/deepin-wine-xiguavideo.install
@@ -7,10 +7,10 @@ post_install() {
info
}
post_upgrade() {
- find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/@bottlename@/reinstalled \;
+ find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/Deepin-XiguaVideo/reinstalled \;
info
}
pre_remove() {
- echo "deleting the @bottlename@ bottle..."
- find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/@bottlename@/ \;
+ echo "deleting the Deepin-XiguaVideo bottle..."
+ find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Deepin-XiguaVideo/ \;
} \ No newline at end of file
diff --git a/deepin-wine-xiguavideo.sh b/deepin-wine-xiguavideo.sh
index 11f8400ef9e7..ef3ac8b9c780 100644
--- a/deepin-wine-xiguavideo.sh
+++ b/deepin-wine-xiguavideo.sh
@@ -1,12 +1,5 @@
#!/bin/sh
-
-# Copyright (C) 2016 Deepin, Inc.
-#
-# Author: Li LongYu <lilongyu@linuxdeepin.com>
-# Peng Hao <penghao@linuxdeepin.com>
-
-# Vufa <countstarlight@gmail.com>
-
+set -e
BOTTLENAME=@bottlename@
APPVER=@appver@
WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
@@ -21,55 +14,47 @@ EXPORT_ENVS=""
SPECIFY_SHELL_DIR=$(dirname ${START_SHELL_PATH})
export SPECIFY_SHELL_DIR
ARCHIVE_FILE_DIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
-export WINEDLLPATH=/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64
-export LD_LIBRARY_PATH=/opt/apps/${DEB_PACKAGE_NAME}/files/lib32
+export WINEDLLPATH="/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64"
+export LD_LIBRARY_PATH="/opt/apps/${DEB_PACKAGE_NAME}/files/lib32"
export WINEPREDLL="${ARCHIVE_FILE_DIR}/dlls"
-
msg() {
ECHO_LEVEL=("\033[1;32m==> " "\033[1;31m==> ERROR: ")
echo -e "${ECHO_LEVEL[$1]}\033[1;37m$2\033[0m"
}
-
OpenWinecfg() {
msg 0 "Launching winecfg with ${APPRUN_CMD} in ${WINEPREFIX} ..."
env WINEPREFIX="${WINEPREFIX}" ${APPRUN_CMD} winecfg
}
-
WakeApp() {
env WINEPREDLL="${ARCHIVE_FILE_DIR}/dlls" \
- WINEDLLPATH=/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64 \
- WINEPREFIX="${WINEPREFIX}" ${APPRUN_CMD} /opt/deepinwine/tools/sendkeys.exe w
+ WINEDLLPATH="/opt/${APPRUN_CMD}/lib:/opt/${APPRUN_CMD}/lib64" \
+ WINEPREFIX="${WINEPREFIX}" "${APPRUN_CMD}" /opt/deepinwine/tools/sendkeys.exe w
}
-
Run() {
if [ -z "${DISABLE_ATTACH_FILE_DIALOG}" ]; then
export ATTACH_FILE_DIALOG=1
fi
-
if [ -n "${EXPORT_ENVS}" ]; then
export "${EXPORT_ENVS}"
fi
-
if [ -n "${EXEC_PATH}" ]; then
if [ -z "${EXEC_PATH##*.lnk}" ]; then
msg 0 "Launching ${EXEC_PATH} lnk file ..."
- ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "C:/windows/command/start.exe" "/Unix" "${EXEC_PATH}" "$@"
+ exec "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "C:/windows/command/start.exe" "/Unix" "${EXEC_PATH}" "$@" || exit $?
else
msg 0 "Launching ${EXEC_PATH} ..."
- ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${EXEC_PATH}" "$@"
+ exec "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "${EXEC_PATH}" "$@" || exit $?
fi
else
- ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "uninstaller.exe" "$@"
+ exec "${START_SHELL_PATH}" "${BOTTLENAME}" "${APPVER}" "uninstaller.exe" "$@" || exit $?
fi
}
-
HelpApp() {
echo " Extra Commands:"
echo " winecfg Open winecfg"
echo " -w/--wake Wake up background program"
echo " -h/--help Show program help info"
}
-
if [ -z "$1" ]; then
Run "$@"
exit 0