diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 46 | ||||
| -rw-r--r-- | deepin-wine-douyin.install | 4 | ||||
| -rwxr-xr-x | run.sh | 111 |
4 files changed, 95 insertions, 78 deletions
@@ -1,7 +1,7 @@ pkgbase = deepin-wine-douyin - pkgdesc = douyin,record beautify life + pkgdesc = douyin,record beautify life;抖音，记录美好生活 pkgver = 1.8.0 - pkgrel = 1 + pkgrel = 2 url = https://www.douyin.com/ install = deepin-wine-douyin.install arch = x86_64 @@ -9,14 +9,16 @@ pkgbase = deepin-wine-douyin depends = deepin-wine6-stable depends = spark-dwine-helper-git depends = xdg-utils - provides = douyin + optdepends = wqy-microhei + optdepends = wqy-zenhei + provides = ByteDance source = https://mirrors.sdu.edu.cn/spark-store-repository/store/video/com.douyin.spark/com.douyin.spark_1.7.1spark2_i386.deb source = douyin-1.8.0.exe::https://www.douyin.com/download/pc/obj/douyin-pc-client/7044145585217083655/releases/9818478/1.8.0/win32-ia32/douyin-v1.8.0-win32-ia32-douyinDownload1.exe source = deepin-wine-douyin.install source = run.sh sha256sums = ddb6e863b45e4eddee273119866e73de27b10efa5e57054933153fb442f1ce10 sha256sums = 322ea0649362f110cd88e5ea5f5b68b0a599837332ddfa112e385c933bf36521 - sha256sums = 848e0cf20cd7d123171a02764ad311fc1b1a050df361ebad45ea2efd16dfee07 - sha256sums = ac1ca15434abfc4b3349481c0499d796f99e704367baf010d5e972f8e2f6df6e + sha256sums = e476028b1c94fe6a4d1a24e4b603667a39276c21dfbe76433c42cf64a73d16be + sha256sums = 8a2d62594c1cd12f6d73b574375b850d650a7da1b432412192cdadf7f50c1bbb pkgname = deepin-wine-douyin @@ -2,11 +2,12 @@ pkgname=deepin-wine-douyin _pkgname=com.douyin.spark _officalname=douyin +_providername=ByteDance pkgver=1.8.0 sparkver=1.7.1spark2 -pkgrel=1 +pkgrel=2 epoch= -pkgdesc="douyin,record beautify life" +pkgdesc="douyin,record beautify life;抖音，记录美好生活" arch=("x86_64") url="https://www.douyin.com/" license=('custom') @@ -15,9 +16,12 @@ depends=( 'spark-dwine-helper-git' 'xdg-utils' ) -optdepends=( ) +optdepends=( + 'wqy-microhei' + 'wqy-zenhei' + ) conflicts=() -provides=("douyin") +provides=("ByteDance") install="deepin-wine-douyin.install" source=("https://mirrors.sdu.edu.cn/spark-store-repository/store/video/${_pkgname}/${_pkgname}_${sparkver}_i386.deb" "${_officalname}-${pkgver}.exe::https://www.douyin.com/download/pc/obj/${_officalname}-pc-client/7044145585217083655/releases/9818478/${pkgver}/win32-ia32/${_officalname}-v${pkgver}-win32-ia32-douyinDownload1.exe" @@ -25,29 +29,39 @@ source=("https://mirrors.sdu.edu.cn/spark-store-repository/store/video/${_pkgnam run.sh) sha256sums=('ddb6e863b45e4eddee273119866e73de27b10efa5e57054933153fb442f1ce10' '322ea0649362f110cd88e5ea5f5b68b0a599837332ddfa112e385c933bf36521' - '848e0cf20cd7d123171a02764ad311fc1b1a050df361ebad45ea2efd16dfee07' - 'ac1ca15434abfc4b3349481c0499d796f99e704367baf010d5e972f8e2f6df6e') + 'e476028b1c94fe6a4d1a24e4b603667a39276c21dfbe76433c42cf64a73d16be' + '8a2d62594c1cd12f6d73b574375b850d650a7da1b432412192cdadf7f50c1bbb') prepare() { bsdtar -xf data.tar.xz + mv "${srcdir}/opt/apps/${_pkgname}" "${srcdir}/opt/apps/${pkgname}" mkdir -p "${srcdir}/tmp" - msg "Extracting Deepin Wine douyin archive ..." - 7za x -aoa "${srcdir}/opt/apps/${_pkgname}/files/files.7z" -o"${srcdir}/tmp" + msg "Extracting Deepin Wine ${_officalname} archive ..." + 7za x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp" - msg "Copying latest douyin installer to ${srcdir}/tmp/drive_c/Program Files/ByteDance/douyin ..." - install -m644 "${_officalname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files/ByteDance/${_officalname}-${pkgver}.exe" + msg "Copying latest ${_officalname} installer to ${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname} ..." + rm -r "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname}" + mkdir -p "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname}" + install -m644 "${_officalname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files/${_providername}/${_officalname}-${pkgver}.exe" msg "Repackaging app archive ..." - 7za a -t7z -r "${srcdir}/opt/apps/${_pkgname}/files/files.7z" "${srcdir}/tmp/*" + rm -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" + 7za a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*" - sed 's/Video/AudioVideo/g' -i "${srcdir}/opt/apps/${_pkgname}/entries/applications/${_pkgname}.desktop" + mv "${srcdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop" "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop" + mv "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png" + sed 's/com.douyin.spark/deepin-wine-douyin/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop" + sed 's/Video/AudioVideo/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop" + + echo "Icon=deepin-wine-douyin.png" >> "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop" + rm -rf ${srcdir}/opt/apps/${_pkgname}/info } package() { cp -r "${srcdir}/opt" "${pkgdir}" - md5sum "${pkgdir}/opt/apps/${_pkgname}/files/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${_pkgname}/files/files.md5sum" - install -Dm644 ${srcdir}/opt/apps/${_pkgname}/entries/applications/${_pkgname}.desktop ${pkgdir}/usr/share/applications/${_pkgname}.desktop - install -Dm644 ${srcdir}/opt/apps/${_pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png - install -Dm755 "run.sh" "${pkgdir}/opt/apps/${_pkgname}/files/" + md5sum "${pkgdir}/opt/apps/${pkgname}/files/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${pkgname}/files/files.md5sum" + install -Dm644 ${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 ${srcdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.png + install -Dm755 "run.sh" "${pkgdir}/opt/apps/${pkgname}/files/" } diff --git a/deepin-wine-douyin.install b/deepin-wine-douyin.install index 254cf960f18c..11b367ea146b 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 \{\}/Spark-douyin/reinstalled \; + find /home -maxdepth 2 -name ".deepinwine" -exec rm -f \{\}/Deepin-douyin/reinstalled \; info } pre_remove() { echo "deleting the douyin bottle..." - find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Spark-douyin/ \; + find /home -maxdepth 2 -name ".deepinwine" -exec rm -rf \{\}/Deepin-douyin/ \; } @@ -1,101 +1,102 @@ #!/bin/sh - + # Copyright (C) 2016 Deepin, Inc. # # Author: Li LongYu <lilongyu@linuxdeepin.com> # Peng Hao <penghao@linuxdeepin.com> - + # Vufa <countstarlight@gmail.com> - -BOTTLENAME="Spark-douyin" + +BOTTLENAME="Deepin-douyin" APPVER="1.7.1spark2" -WINEPREFIX="$HOME/.deepinwine/$BOTTLENAME" -DOUYIN_VER="1.8.0" -EXEC_PATH="c:/Program Files/ByteDance/douyin/douyin.exe" -EXEC_FILE="$WINEPREFIX/drive_c/Program Files/ByteDance/douyin/douyin.exe" +WINEPREFIX="$HOME/.deepinwine/${BOTTLENAME}" +EXEC_PATH="C:/Program Files/ByteDance/douyin.exe" +EXEC_FILE="${WINEPREFIX}/drive_c/Program Files/ByteDance/douyin.exe" START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh" DOUYIN_INSTALLER="douyin" -DOUYIN_INSTALLER_PATH="c:/Program Files/ByteDance/$DOUYIN_INSTALLER-$DOUYIN_VER.exe" +DOUYIN_VER="1.8.0" +DOUYIN_INSTALLER_PATH="C:/Program Files/ByteDance/${DOUYIN_INSTALLER}-${DOUYIN_VER}.exe" export MIME_TYPE="" -export DEB_PACKAGE_NAME="com.douyin.spark" +export DEB_PACKAGE_NAME="deepin-wine-douyin" export APPRUN_CMD="deepin-wine6-stable" DISABLE_ATTACH_FILE_DIALOG="" EXPORT_ENVS="" - -export SPECIFY_SHELL_DIR=$(dirname $START_SHELL_PATH) - -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 WINEPREDLL="$ARCHIVE_FILE_DIR/dlls" - +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 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 + msg 0 "Launching winecfg with ${APPRUN_CMD} in ${WINEPREFIX} ..." + env WINEPREFIX="${WINEPREFIX}" ${APPRUN_CMD} winecfg } - + DeployApp() { # deploy bottle - msg 0 "Deploying $WINEPREFIX ..." - rm -rf "$WINEPREFIX" + msg 0 "Deploying ${WINEPREFIX} ..." + rm -rf "${WINEPREFIX}" # run installer - msg 0 "Launching $DOUYIN_INSTALLER_PATH ..." - env WINEDLLOVERRIDES="winemenubuilder.exe=d" $START_SHELL_PATH $BOTTLENAME $APPVER "$DOUYIN_INSTALLER_PATH" "$@" + msg 0 "Launching ${DOUYIN_INSTALLER_PATH} ..." + env WINEDLLOVERRIDES="winemenubuilder.exe=d" ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${DOUYIN_INSTALLER_PATH}" "$@" - touch $WINEPREFIX/reinstalled - msg 0 "Creating $WINEPREFIX/$PACKAGE_VERSION ..." - cat /opt/apps/$DEB_PACKAGE_NAME/files/files.md5sum >$WINEPREFIX/PACKAGE_VERSION + touch "${WINEPREFIX}"/reinstalled + msg 0 "Creating ${WINEPREFIX}/PACKAGE_VERSION ..." + cat /opt/apps/${DEB_PACKAGE_NAME}/files/files.md5sum >"${WINEPREFIX}"/PACKAGE_VERSION } 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 + 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 } Run() { - if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ]; then + if [ -z "${DISABLE_ATTACH_FILE_DIALOG}" ]; then export ATTACH_FILE_DIALOG=1 fi - - if [ -n "$EXPORT_ENVS" ]; then - export $EXPORT_ENVS + + if [ -n "${EXPORT_ENVS}" ]; then + export "${EXPORT_ENVS}" fi - - if [ -n "$EXEC_PATH" ]; then - if [ ! -f "$WINEPREFIX/reinstalled" ] || [ ! -f "$EXEC_FILE" ]; then - DeployApp + + if [ -n "${EXEC_PATH}" ]; then + if [ ! -f "${WINEPREFIX}/reinstalled" ] || [ ! -f "$EXEC_FILE" ]; then + DeployApp "$@" exit 0 fi - + 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" "$@" + msg 0 "Launching ${EXEC_PATH} lnk file ..." + ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "C:/windows/command/start.exe" "/Unix" "${EXEC_PATH}" "$@" else - msg 0 "Launching $EXEC_PATH ..." - $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@" + msg 0 "Launching ${EXEC_PATH} ..." + ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${EXEC_PATH}" "$@" fi else - $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@" + ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "uninstaller.exe" "$@" 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 + +if [ -z "$1" ]; then Run "$@" exit 0 fi @@ -104,13 +105,13 @@ case $1 in OpenWinecfg ;; "-w" | "--wake") - WakeApp + WakeApp "$@" ;; "-h" | "--help") - HelpApp + HelpApp "$@" ;; *) Run "$@" ;; esac -exit 0 +exit 0
\ No newline at end of file |