fix errors

3 files changed, 35 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9963267f2c7..76ff2595ad02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = deepin-wine-ximalaya
 	pkgdesc = 喜马拉雅，是中国领先的音频分享平台。用声音分享人类智慧，用声音服务美好生活，做一家人一辈子的精神食粮，是平台的使命和初心。
 	pkgver = 4.0.0.804
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.ximalaya.com
 	install = deepin-wine-ximalaya.install
 	arch = x86_64
 	license = custom:freeware
+	makedepends = p7zip
 	depends = deepin-wine6-stable
+	depends = deepin-wine-helper
 	depends = xdg-utils
-	depends = hicolor-icon-theme
 	depends = sh
 	depends = lib32-glibc
 	optdepends = wqy-microhei
 	optdepends = wqy-zenhei
 	provides = ximalaya
+	conflicts = ximalaya
+	conflicts = com.ximalaya.spark
 	source = com.ximalaya.spark_4.0.0spark9_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/music/com.ximalaya.spark/com.ximalaya.spark_4.0.0spark9_amd64.deb
 	source = ximalaya-4.0.0.804.exe::https://www.ximalaya.com/down/lite/v2?client=win&channelId=99&subChannelId=100002
 	source = LICENSE.html
@@ -23,6 +26,6 @@ pkgbase = deepin-wine-ximalaya
 	sha256sums = 180ce17541504177a96194d25a7175030023479c1bf47df788b1a82c4c3790d1
 	sha256sums = 95b52ed4c2b0ef19d4a091da847c7dd20761699aa63a12bf933fa2064f49cd01
 	sha256sums = 6f2e0e87fe8f1abbd947d311b0fcad50c9c4c22a2531b8277db4e28e0a2d78dd
-	sha256sums = da34f807690703b338b18003b6c6151e6c721bb2ca1bee78f4df6a6f1d8afc88
+	sha256sums = f90d36cc56a4d4a0469c36bbd33597871e2a609b27d187a625d63d005a2b2332
 
 pkgname = deepin-wine-ximalaya
diff --git a/PKGBUILD b/PKGBUILD
index 3846ff3df427..2cefe1005270 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,52 @@ pkgname="deepin-wine-${_appname}"
 pkgver=4.0.0.804
 _sparkpkgname="com.${_appname}.spark"
 _sparkver=4.0.0spark9
-pkgrel=3
+pkgrel=4
 pkgdesc="喜马拉雅，是中国领先的音频分享平台。用声音分享人类智慧，用声音服务美好生活，做一家人一辈子的精神食粮，是平台的使命和初心。"
 arch=("x86_64")
 url="https://www.ximalaya.com"
 license=('custom:freeware')
-depends=('deepin-wine6-stable' 'xdg-utils' 'hicolor-icon-theme' 'sh' 'lib32-glibc')
+depends=('deepin-wine6-stable' 'deepin-wine-helper' 'xdg-utils' 'sh' 'lib32-glibc')
 optdepends=('wqy-microhei' 'wqy-zenhei')
+makedepends=('p7zip')
 provides=("${_appname}")
+conflicts=("${_appname}" "${_sparkpkgname}")
 install="${pkgname}.install"
 source=("${_sparkpkgname}_${_sparkver}_amd64.deb::https://mirrors.sdu.edu.cn/spark-store-repository/store/music/${_sparkpkgname}/${_sparkpkgname}_${_sparkver}_amd64.deb"
     "${_appname}-${pkgver}.exe::${url}/down/lite/v2?client=win&channelId=99&subChannelId=100002"
     "LICENSE.html"
     "${pkgname}".install
-    "run.sh"    )
+    "run.sh")
 sha256sums=('95834bc4ad16e4822331adac43b5f4feb9aeba50d103788a2cefad72cd8dc941'
             '180ce17541504177a96194d25a7175030023479c1bf47df788b1a82c4c3790d1'
             '95b52ed4c2b0ef19d4a091da847c7dd20761699aa63a12bf933fa2064f49cd01'
             '6f2e0e87fe8f1abbd947d311b0fcad50c9c4c22a2531b8277db4e28e0a2d78dd'
-            'da34f807690703b338b18003b6c6151e6c721bb2ca1bee78f4df6a6f1d8afc88')
-package() {
-    bsdtar -xf data.tar.xz -C "${pkgdir}"
-    mv "${pkgdir}/opt/apps/${_sparkpkgname}" "${pkgdir}/opt/apps/${pkgname}"
+            'f90d36cc56a4d4a0469c36bbd33597871e2a609b27d187a625d63d005a2b2332')
+prepare() {
+    bsdtar -xf "${srcdir}/data.tar.xz"
     mkdir -p "${srcdir}/tmp"
+
     msg "Extracting Deepin Wine ${_appname} archive ..."
-    7z x -aoa "${pkgdir}/opt/apps/${pkgname}/files/files.7z" -o"${srcdir}/tmp"     
+    bsdtar -xf "${srcdir}/opt/apps/${_sparkpkgname}/files/files.7z" -C "${srcdir}/tmp"
+
     msg "Extracting latest ${_appname} installer to ${srcdir}/tmp/drive_c/Program Files (x86)/${_appname} ..."
     7z x -aoa "${_appname}-${pkgver}.exe"
-    bsdtar -xf "${srcdir}/${_appname}-${pkgver}-ia32.nsis.7z" -C "${srcdir}/tmp/drive_c/Program Files (x86)/${_appname}"
+    bsdtar -xf "${srcdir}/${_appname}-${pkgver%.804}-ia32.nsis.7z" -C "${srcdir}/tmp/drive_c/Program Files (x86)/${_appname}"
+
     msg "Repackaging app archive ..."
-    rm -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z"
-    7z a -t7z -r "${pkgdir}/opt/apps/${pkgname}/files/files.7z" "${srcdir}/tmp/*"     
-    sed 's|com.ximalaya.spark|deepin-wine-ximalaya|g;s|Audio|AudioVideo|g' -i "${pkgdir}/opt/apps/${pkgname}/entries/applications/${_sparkpkgname}.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 "${pkgdir}/opt/apps/${pkgname}/entries/applications/${_sparkpkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm644 "${pkgdir}/opt/apps/${pkgname}/entries/icons/hicolor/scalable/apps/${_sparkpkgname}.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.png"
+    rm -rf "${srcdir}/opt/apps/${_sparkpkgname}/files/files.7z"
+    7z a -t7z -r "${srcdir}/opt/apps/${_sparkpkgname}/files/files.7z" "${srcdir}/tmp/*"
+
+    sed "s|${_sparkpkgname}|${pkgname}|g;s|\"/opt/apps/${pkgname}/files/run.sh\" -u %u|${pkgname} -u %U|g" \
+        -i "${srcdir}/opt/apps/${_sparkpkgname}/entries/applications/${_sparkpkgname}.desktop"
+    md5sum "${srcdir}/opt/apps/${_sparkpkgname}/files/files.7z" | awk '{ print $1 }' > "${srcdir}/opt/apps/${_sparkpkgname}/files/files.md5sum"
+}
+package() {
+    install -Dm755 -d "${pkgdir}/"{opt/"${pkgname}",usr/bin}
+    cp -r "${srcdir}/opt/apps/${_sparkpkgname}/"{entries,files} "${pkgdir}/opt/${pkgname}"
+    install -Dm755 "${srcdir}/run.sh" "${pkgdir}/opt/${pkgname}/files/"
+    ln -sf "/opt/${pkgname}/files/run.sh" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${srcdir}/opt/apps/${_sparkpkgname}/entries/applications/${_sparkpkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "${srcdir}/opt/apps/${_sparkpkgname}/entries/icons/hicolor/scalable/apps/${_sparkpkgname}.png" "${pkgdir}/usr/share/maps/${pkgname}.png"
     install -Dm644 "${srcdir}/LICENSE.html" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -Dm755 "${srcdir}/run.sh" "${pkgdir}/opt/apps/${pkgname}/files/"
 }
\ No newline at end of file
diff --git a/run.sh b/run.sh
index aa989bd826fb..989f0ee6b3a0 100644
--- a/run.sh
+++ b/run.sh
@@ -16,8 +16,8 @@ export DEB_PACKAGE_NAME="deepin-wine-ximalaya"
 export APPRUN_CMD="deepin-wine6-stable"
 DISABLE_ATTACH_FILE_DIALOG="1"
 export SPECIFY_SHELL_DIR=`dirname ${START_SHELL_PATH}`
-ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
-export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+ARCHIVE_FILE_DIR="/opt/${DEB_PACKAGE_NAME}/files"
+export WINEPREDLL="${ARCHIVE_FILE_DIR}/dlls"
    
 if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
     export ATTACH_FILE_DIALOG=1