summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD58
-rw-r--r--run.sh48
3 files changed, 59 insertions, 61 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a11942101d22..c3f8ecfd12d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = deepin-wine-baiduwenku
pkgdesc = Baidu wenku Client on Deepin Wine6.一款由百度发布的供网友在线分享文档的平台
- pkgver = 1.1.8
- pkgrel = 3
- url = https://wenku.baidu.com/
+ pkgver = 1.2.0
+ pkgrel = 1
+ url = https://wenku.baidu.com
install = deepin-wine-baiduwenku.install
arch = x86_64
license = custom
@@ -12,15 +12,15 @@ pkgbase = deepin-wine-baiduwenku
optdepends = wqy-microhei
optdepends = wqy-zenhei
provides = Baidu
- source = com.baidu.wenku.spark_1.1.7spark1_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/com.baidu.wenku.spark/com.baidu.wenku.spark_1.1.7spark1_amd64.deb
- source = BaiduWenku-1.1.8.exe::https://edu-wenku.bdimg.com/v1/na/0807/PC%E5%AE%A2%E6%88%B7%E7%AB%AF%E7%89%88%E6%9C%AC%E5%8C%85/%E7%99%BE%E5%BA%A6%E6%96%87%E5%BA%93%20Setup%201.1.8.exe
+ source = com.baidu.wenku.spark_1.1.7spark1_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/office/com.baidu.wenku.spark/com.baidu.wenku.spark_1.1.7spark1_amd64.deb
+ source = BaiduWenku-1.2.0.exe::https://edu-wenku.bdimg.com/v1/na/0807/PC%E5%AE%A2%E6%88%B7%E7%AB%AF%E7%89%88%E6%9C%AC%E5%8C%85/%E7%99%BE%E5%BA%A6%E6%96%87%E5%BA%93%20Setup%201.2.0.exe
source = LICENSE::https://wenku.baidu.com/portal/browse/help#help/24
source = deepin-wine-baiduwenku.install
source = run.sh
sha256sums = d6f7fa0257c3cdfcc3f12df61d57b2d624f0f30b63cb5b15cbde9fc7de417f3e
- sha256sums = 13128f5701824669a2353fdba22049351d15173ab87e0c59b75b91fc750bf18d
+ sha256sums = b1ef2994618ac95f4ea1ff402ec35958e9ce5b8189988d2d7342d627e0a71dc8
sha256sums = 2a7148bb687aed4dcd3e0cb9dcece348d678f4d24da303d0128f2ae3d111f13d
sha256sums = 3cc53852b7bf733f9e6c28466dec84899d752983fed19fb5825b480b05952a77
- sha256sums = f681b67f89b42a7f0ec0944e76e0a5d07bf1761505727f5e37c2cbef822bcc1f
+ sha256sums = de3605767d811aa574219dbafb1bbafece6c33ae00e5dfe56b74b0779f69e9ef
pkgname = deepin-wine-baiduwenku
diff --git a/PKGBUILD b/PKGBUILD
index 03ea0e2017e4..8fbc7532e7b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@ pkgname=deepin-wine-baiduwenku
_pkgname=com.baidu.wenku.spark
_officalname=BaiduWenku
_installname=wenku-pc
-pkgver=1.1.8
+pkgver=1.2.0
sparkver=1.1.7spark1
-pkgrel=3
+pkgrel=1
epoch=
pkgdesc="Baidu wenku Client on Deepin Wine6.一款由百度发布的供网友在线分享文档的平台"
arch=("x86_64")
-url="https://wenku.baidu.com/"
+url="https://wenku.baidu.com"
license=('custom')
depends=(
'deepin-wine6-stable'
@@ -24,45 +24,43 @@ conflicts=()
provides=("Baidu")
install="deepin-wine-baiduwenku.install"
source=(
- "${_pkgname}_${sparkver}_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/video/${_pkgname}/${_pkgname}_${sparkver}_amd64.deb"
- "${_officalname}-${pkgver}.exe::https://edu-wenku.bdimg.com/v1/na/0807/PC%E5%AE%A2%E6%88%B7%E7%AB%AF%E7%89%88%E6%9C%AC%E5%8C%85/%E7%99%BE%E5%BA%A6%E6%96%87%E5%BA%93%20Setup%201.1.8.exe"
- "LICENSE::https://wenku.baidu.com/portal/browse/help#help/24"
+ "${_pkgname}_${sparkver}_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/office/${_pkgname}/${_pkgname}_${sparkver}_amd64.deb"
+ "${_officalname}-${pkgver}.exe::https://edu-wenku.bdimg.com/v1/na/0807/PC%E5%AE%A2%E6%88%B7%E7%AB%AF%E7%89%88%E6%9C%AC%E5%8C%85/%E7%99%BE%E5%BA%A6%E6%96%87%E5%BA%93%20Setup%201.2.0.exe"
+ "LICENSE::${url}/portal/browse/help#help/24"
"deepin-wine-baiduwenku.install"
"run.sh"
)
sha256sums=('d6f7fa0257c3cdfcc3f12df61d57b2d624f0f30b63cb5b15cbde9fc7de417f3e'
- '13128f5701824669a2353fdba22049351d15173ab87e0c59b75b91fc750bf18d'
+ 'b1ef2994618ac95f4ea1ff402ec35958e9ce5b8189988d2d7342d627e0a71dc8'
'2a7148bb687aed4dcd3e0cb9dcece348d678f4d24da303d0128f2ae3d111f13d'
'3cc53852b7bf733f9e6c28466dec84899d752983fed19fb5825b480b05952a77'
- 'f681b67f89b42a7f0ec0944e76e0a5d07bf1761505727f5e37c2cbef822bcc1f')
-
-prepare() {
- bsdtar -xf data.tar.xz
- mv "${srcdir}/opt/apps/${_pkgname}" "${srcdir}/opt/apps/${pkgname}"
+ 'de3605767d811aa574219dbafb1bbafece6c33ae00e5dfe56b74b0779f69e9ef')
+
+package() {
+ bsdtar -xf data.tar.xz -C "${pkgdir}"
+ mv "${pkgdir}/opt/apps/${_pkgname}" "${pkgdir}/opt/apps/${pkgname}"
mkdir -p "${srcdir}/tmp"
msg "Extracting Deepin Wine ${_officalname} archive ..."
- 7za x -aoa "${srcdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
-
+ 7za x -aoa "${pkgdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"
+
msg "Copying latest ${_officalname} installer to ${srcdir}/tmp/drive_c/Program Files/${_installname} ..."
- rm -r "${srcdir}/tmp/drive_c/Program Files (x86)/${_installname}"
+ rm -r "${srcdir}/tmp/drive_c/Program Files (x86)/${_installname}" "${srcdir}/tmp/drive_c/Program Files/"
mkdir -p "${srcdir}/tmp/drive_c/Program Files (x86)/${_installname}/"
install -m644 "${_officalname}-${pkgver}.exe" "${srcdir}/tmp/drive_c/Program Files (x86)/${_installname}/${_officalname}-${pkgver}.exe"
-
+
msg "Repackaging app archive ..."
- rm -r "${srcdir}/opt/apps/${pkgname}/files/files.7z"
- 7za a -t7z -r "${srcdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"
-
- 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.baidu.wenku.spark/deepin-wine-baiduwenku/g' -i "${srcdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
- rm -rf ${srcdir}/opt/apps/${_pkgname}/info
-}
-
-package() {
- cp -r "${srcdir}/opt" "${pkgdir}"
+ rm -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z"
+ 7za a -t7z -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"
+
+ mv "${pkgdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop" "${pkgdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
+ mv "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_pkgname}.png" "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png"
+ sed 's/com.baidu.wenku.spark/deepin-wine-baiduwenku/g' -i "${pkgdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop"
+ rm -rf ${pkgdir}/opt/apps/${_pkgname}/info
+
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"
+ rm -r "${pkgdir}/opt/apps/${pkgname}/info"
+ install -Dm644 "${pkgdir}/opt/apps/${pkgname}/entries/applications/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+ install -Dm644 "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${pkgname}.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.png"
install -Dm755 "${srcdir}/run.sh" "${pkgdir}/opt/apps/${pkgname}/files/"
install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
+} \ No newline at end of file
diff --git a/run.sh b/run.sh
index 7de21ee91496..75a60f133a66 100644
--- a/run.sh
+++ b/run.sh
@@ -1,48 +1,48 @@
#!/bin/sh
-
+
# Copyright (C) 2016 Deepin, Inc.
#
# Author: Li LongYu <lilongyu@linuxdeepin.com>
# Peng Hao <penghao@linuxdeepin.com>
-
+
# Vufa <countstarlight@gmail.com>
-
+
BOTTLENAME="Deepin-BaiduWenku"
APPVER="1.1.7spark1"
-WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
-EXEC_PATH="c:/Program Files (x86)/wenku-pc/百度文库_105.exe"
-EXEC_FILE="${WINEPREFIX}/drive_c/Program Files (x86)/wenku-pc/百度文库_105.exe"
-START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
UPDATEAPP_INSTALLER="BaiduWenku"
-UPDATEAPP_VER="1.1.8"
+UPDATEAPP_VER="1.2.0"
UPDATEAPP_INSTALLER_PATH="c:/Program Files (x86)/wenku-pc/${UPDATEAPP_INSTALLER}-${UPDATEAPP_VER}.exe"
+WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
+EXEC_PATH="c:/Program Files (x86)/wenku-pc/百度文库.exe"
+EXEC_FILE="${WINEPREFIX}/drive_c/Program Files (x86)/wenku-pc/百度文库.exe"
+START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
export MIME_TYPE=""
export DEB_PACKAGE_NAME="deepin-wine-baiduwenku"
export APPRUN_CMD="deepin-wine6-stable"
DISABLE_ATTACH_FILE_DIALOG=""
EXPORT_ENVS=""
SPECIFY_SHELL_DIR=$(dirname ${START_SHELL_PATH})
-
-export SPECIFY_SHELL_DIR
+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
}
-
+
DeployApp() {
# deploy bottle
msg 0 "Deploying ${WINEPREFIX} ..."
@@ -50,33 +50,33 @@ DeployApp() {
# run installer
msg 0 "Launching ${UPDATEAPP_INSTALLER_PATH} ..."
env WINEDLLOVERRIDES="winemenubuilder.exe=d" ${START_SHELL_PATH} ${BOTTLENAME} ${APPVER} "${UPDATEAPP_INSTALLER_PATH}" "$@"
-
+
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
}
-
+
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 [ ! -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}" "$@"
@@ -88,14 +88,14 @@ Run() {
${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
Run "$@"
exit 0