summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD38
-rw-r--r--deepin-wine-douyin.install6
-rw-r--r--deepin-wine-douyin.sh8
4 files changed, 34 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5bec77cbab7..d4ebe0034160 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = deepin-wine-douyin
pkgdesc = douyin,record beautify life;抖音,记录美好生活
- pkgver = 2.9.2
+ pkgver = 3.1.1
pkgrel = 2
url = https://www.douyin.com
install = deepin-wine-douyin.install
@@ -15,10 +15,12 @@ pkgbase = deepin-wine-douyin
optdepends = wqy-zenhei
conflicts = douyin
source = com.douyin.spark_2.9.2spark7_i386.deb::https://mirrors.sdu.edu.cn/spark-store//store/video/com.douyin.spark/com.douyin.spark_2.9.2spark7_all.deb
+ source = douyin-3.1.1.exe::https://sw.pcmgr.qq.com/ca75e0758b378d91d9e138495127f8a1/657ade18/spcmgr/download/douyin-v3.1.1-win32-ia32-tencent.exe
source = LICENSE.html::https://www.douyin.com/draft/douyin_agreement/douyin_agreement_user.html
source = deepin-wine-douyin.sh
sha256sums = f5bb3df57822718590e0bc432ed33f1548350add863a11e6a39058ea784c7c17
+ sha256sums = 2896afc36b7817dbd6e1000af4e27c0aa088f2144d4462d99b6f6329bca289ea
sha256sums = 80d1bfb7a530d4497e8be2305e2ee662a25c4d6bc2e8f1b3a24642eec7efd054
- sha256sums = d79124897371fb614d86d7e6b54d189442284b83b04028bfcd83dcddf39473d6
+ sha256sums = ab98d48487a4682e7e01f05f0f6333f35d8fef346d568f916d0c052e5198f05d
pkgname = deepin-wine-douyin
diff --git a/PKGBUILD b/PKGBUILD
index 04ce5731ea1a..ffadcc25545b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@ _appname=douyin
pkgname="deepin-wine-${_appname}"
_pkgname="com.${_appname}.spark"
_providername=ByteDance
-pkgver=2.9.2
+pkgver=3.1.1
_sparkver=2.9.2spark7
pkgrel=2
pkgdesc="douyin,record beautify life;抖音,记录美好生活"
arch=('x86_64')
url="https://www.douyin.com"
-_downurl="https://webcdn.m.qq.com/spcmgr/download"
+_downurl="https://pc.qq.com"
license=('custom')
depends=(
'deepin-wine6-stable'
@@ -28,27 +28,35 @@ conflicts=("${_appname}")
install="${pkgname}.install"
source=(
"${_pkgname}_${_sparkver}_i386.deb::https://mirrors.sdu.edu.cn/spark-store//store/video/${_pkgname}/${_pkgname}_${_sparkver}_all.deb"
- #"${_appname}-${pkgver}.exe::${_downurl}/${_appname}-v${pkgver}-win32-ia32-tencent.exe"
+ "${_appname}-${pkgver}.exe::https://sw.pcmgr.qq.com/ca75e0758b378d91d9e138495127f8a1/657ade18/spcmgr/download/${_appname}-v${pkgver}-win32-ia32-tencent.exe"
"LICENSE.html::${url}/draft/douyin_agreement/douyin_agreement_user.html"
"${pkgname}.sh"
)
sha256sums=('f5bb3df57822718590e0bc432ed33f1548350add863a11e6a39058ea784c7c17'
+ '2896afc36b7817dbd6e1000af4e27c0aa088f2144d4462d99b6f6329bca289ea'
'80d1bfb7a530d4497e8be2305e2ee662a25c4d6bc2e8f1b3a24642eec7efd054'
- 'd79124897371fb614d86d7e6b54d189442284b83b04028bfcd83dcddf39473d6')
+ 'ab98d48487a4682e7e01f05f0f6333f35d8fef346d568f916d0c052e5198f05d')
build() {
+ sed "s|@bottlename@|Deepin-${_appname}|g" -i "${srcdir}/${pkgname}.install"
+ sed -e "s|@bottlename@|Deepin-${_appname}|g" \
+ -e "s|@appver@|${pkgver}|g" \
+ -e "s|@appname@|${_appname}|g" \
+ -e "s|@packagename@|${pkgname}|g" \
+ -e "s|@pathname@|${_providername}|g" \
+ -i "${srcdir}/${pkgname}.sh"
bsdtar -xf "${srcdir}/data.tar.xz"
mv "${srcdir}/opt/apps/${_pkgname}" "${srcdir}/opt/apps/${pkgname}"
- #mkdir -p "${srcdir}/tmp" "${srcdir}/extracted_exe"
- #msg "Extracting Deepin Wine ${_appname} archive ..."
- #7z x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
- #7z e -aoa "${srcdir}/${_appname}-${pkgver}.exe" -o"${srcdir}/extracted_exe"
- #msg "Extract latest ${_appname} installer to ${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname} ..."
- #rm -rf "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
- #mkdir -p "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
- #bsdtar -xf "${srcdir}/extracted_exe/app.7z" -C "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
- #msg "Repackaging app archive ..."
- #rm -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/opt/apps/${pkgname}/info"
- #7z a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/"*
+ mkdir -p "${srcdir}/tmp" "${srcdir}/extracted_exe"
+ msg "Extracting Deepin Wine ${_appname} archive ..."
+ 7z x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
+ 7z e -aoa "${srcdir}/${_appname}-${pkgver}.exe" -o"${srcdir}/extracted_exe"
+ msg "Extract latest ${_appname} installer to ${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname} ..."
+ rm -rf "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
+ mkdir -p "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
+ bsdtar -xf "${srcdir}/extracted_exe/app.7z" -C "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_appname}"
+ msg "Repackaging app archive ..."
+ rm -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/opt/apps/${pkgname}/info"
+ 7z a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/"*
sed -e "s|Icon=${_pkgname}|Icon=${pkgname}|g" \
-e "s|\"/opt/apps/${_pkgname}/files/run.sh\"|${pkgname}|g" \
-i "${srcdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop"
diff --git a/deepin-wine-douyin.install b/deepin-wine-douyin.install
index 11b367ea146b..30b4b9222304 100644
--- a/deepin-wine-douyin.install
+++ b/deepin-wine-douyin.install
@@ -7,10 +7,10 @@ post_install() {
info
}
post_upgrade() {
- find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/Deepin-douyin/reinstalled \;
+ find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/@bottlename@/reinstalled \;
info
}
pre_remove() {
- echo "deleting the douyin bottle..."
- find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Deepin-douyin/ \;
+ echo "deleting the @bottlename@ bottle..."
+ find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/@bottlename@/ \;
}
diff --git a/deepin-wine-douyin.sh b/deepin-wine-douyin.sh
index 66224542fe14..47f6a839ceb4 100644
--- a/deepin-wine-douyin.sh
+++ b/deepin-wine-douyin.sh
@@ -6,13 +6,13 @@
# Peng Hao <penghao@linuxdeepin.com>
version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-BOTTLENAME="Deepin-douyin"
-APPVER="2.9.2"
+BOTTLENAME=@bottlename@
+APPVER=@appver@
WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
-EXEC_PATH="c:/Program Files/ByteDance/douyin/douyin.exe"
+EXEC_PATH="c:/Program Files/@pathname@/@appname@/@appname@.exe"
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
export MIME_TYPE=""
-export DEB_PACKAGE_NAME="deepin-wine-douyin"
+export DEB_PACKAGE_NAME=@packagename@
export APPRUN_CMD="deepin-wine6-stable"
DISABLE_ATTACH_FILE_DIALOG="1"
export SPECIFY_SHELL_DIR=`dirname ${START_SHELL_PATH}`