fix errors

3 files changed, 33 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3f8ecfd12d0..66a0ce8af838 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = deepin-wine-baiduwenku
 	pkgdesc = Baidu wenku Client on Deepin Wine6.一款由百度发布的供网友在线分享文档的平台
 	pkgver = 1.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wenku.baidu.com
 	install = deepin-wine-baiduwenku.install
 	arch = x86_64
 	license = custom
 	depends = deepin-wine6-stable
-	depends = spark-dwine-helper-git
+	depends = spark-dwine-helper
 	depends = xdg-utils
+	depends = hicolor-icon-theme
+	depends = sh
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
 	provides = Baidu
@@ -19,8 +21,8 @@ pkgbase = deepin-wine-baiduwenku
 	source = run.sh
 	sha256sums = d6f7fa0257c3cdfcc3f12df61d57b2d624f0f30b63cb5b15cbde9fc7de417f3e
 	sha256sums = b1ef2994618ac95f4ea1ff402ec35958e9ce5b8189988d2d7342d627e0a71dc8
-	sha256sums = 2a7148bb687aed4dcd3e0cb9dcece348d678f4d24da303d0128f2ae3d111f13d
+	sha256sums = b379493c48b118858c6a8855b16e18a31487267be4057258ae10c5875fd0ae8e
 	sha256sums = 3cc53852b7bf733f9e6c28466dec84899d752983fed19fb5825b480b05952a77
-	sha256sums = de3605767d811aa574219dbafb1bbafece6c33ae00e5dfe56b74b0779f69e9ef
+	sha256sums = 195cf562e76662fefc238409e92999cfffbe270240d0812d88fdc2eae5d68e1d
 
 pkgname = deepin-wine-baiduwenku
diff --git a/PKGBUILD b/PKGBUILD
index 8fbc7532e7b6..817a4a0e8f99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,36 +5,27 @@ _officalname=BaiduWenku
 _installname=wenku-pc
 pkgver=1.2.0
 sparkver=1.1.7spark1
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Baidu wenku Client on Deepin Wine6.一款由百度发布的供网友在线分享文档的平台"
-arch=("x86_64")
+arch=('x86_64')
 url="https://wenku.baidu.com"
 license=('custom')
-depends=(
-    'deepin-wine6-stable'
-    'spark-dwine-helper-git'
-    'xdg-utils'
-    )
-optdepends=(
-    'wqy-microhei'
-    'wqy-zenhei'
-    )
+depends=('deepin-wine6-stable' 'spark-dwine-helper' 'xdg-utils' 'hicolor-icon-theme' 'sh')
+optdepends=('wqy-microhei' 'wqy-zenhei')
 conflicts=()
 provides=("Baidu")
-install="deepin-wine-baiduwenku.install"
-source=(
-    "${_pkgname}_${sparkver}_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/office/${_pkgname}/${_pkgname}_${sparkver}_amd64.deb"
+install="${pkgname}.install"
+source=("${_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"
-    )
+    "${pkgname}.install"
+    "run.sh"    )
 sha256sums=('d6f7fa0257c3cdfcc3f12df61d57b2d624f0f30b63cb5b15cbde9fc7de417f3e'
             'b1ef2994618ac95f4ea1ff402ec35958e9ce5b8189988d2d7342d627e0a71dc8'
-            '2a7148bb687aed4dcd3e0cb9dcece348d678f4d24da303d0128f2ae3d111f13d'
+            'b379493c48b118858c6a8855b16e18a31487267be4057258ae10c5875fd0ae8e'
             '3cc53852b7bf733f9e6c28466dec84899d752983fed19fb5825b480b05952a77'
-            'de3605767d811aa574219dbafb1bbafece6c33ae00e5dfe56b74b0779f69e9ef')
+            '195cf562e76662fefc238409e92999cfffbe270240d0812d88fdc2eae5d68e1d')
   
 package() {
     bsdtar -xf data.tar.xz -C "${pkgdir}"
@@ -44,23 +35,17 @@ package() {
     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}" "${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"
+    7z e -aoa "${_officalname}-${pkgver}.exe" -o"${srcdir}/tmp/drive_c/Program Files (x86)/${_installname}/"
+    rm -r "${srcdir}/tmp/drive_c/Program Files/" "${srcdir}/tmp/drive_c/Program Files (x86)/${_installname}/\$2"
       
     msg "Repackaging app archive ..."
-    rm -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z"
+    rm -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z" "${pkgdir}/opt/apps/${pkgname}/info"
     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
+    sed 's|com.baidu.wenku.spark|deepin-wine-baiduwenku|g' -i "${pkgdir}/opt/apps/${pkgname}/entries/applications/${_pkgname}.desktop"
  
     md5sum "${pkgdir}/opt/apps/${pkgname}/files/files.7z" | awk '{ print $1 }' > "${pkgdir}/opt/apps/${pkgname}/files/files.md5sum"
-    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 -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"
+    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/run.sh b/run.sh
index 75a60f133a66..7b764ee7acd3 100644
--- a/run.sh
+++ b/run.sh
@@ -8,10 +8,7 @@
 #               Vufa <countstarlight@gmail.com>
      
 BOTTLENAME="Deepin-BaiduWenku"
-APPVER="1.1.7spark1"
-UPDATEAPP_INSTALLER="BaiduWenku"
-UPDATEAPP_VER="1.2.0"
-UPDATEAPP_INSTALLER_PATH="c:/Program Files (x86)/wenku-pc/${UPDATEAPP_INSTALLER}-${UPDATEAPP_VER}.exe"
+APPVER="1.2.0"
 WINEPREFIX="${HOME}/.deepinwine/${BOTTLENAME}"
 EXEC_PATH="c:/Program Files (x86)/wenku-pc/百度文库.exe"
 EXEC_FILE="${WINEPREFIX}/drive_c/Program Files (x86)/wenku-pc/百度文库.exe"
@@ -22,61 +19,38 @@ export APPRUN_CMD="deepin-wine6-stable"
 DISABLE_ATTACH_FILE_DIALOG=""
 EXPORT_ENVS=""
 SPECIFY_SHELL_DIR=$(dirname ${START_SHELL_PATH})
-    
 export SPECIFY_SHELL_DIR
-     
-ARCHIVE_FILE_DIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
-     
+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} ..."
-    rm -rf "${WINEPREFIX}"
-    # 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 +62,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